Version bump. Now needs java 1.6.

(Portage version: 2.2_rc48/cvs/Linux x86_64)

2 files changed, 26 insertions, 114 deletions

diff --git a/dev-java/jtds/files/1.0.2-buildxml.patch b/dev-java/jtds/files/1.2.4-buildxml.patch
index 71e1c8e80dc1..333197fbb4c2 100644
--- a/dev-java/jtds/files/1.0.2-buildxml.patch
+++ b/dev-java/jtds/files/1.2.4-buildxml.patch
@@ -1,39 +1,29 @@
---- build.xml.orig	2005-02-18 16:47:01.193090848 +0100
-+++ build.xml	2005-02-18 16:55:06.447320992 +0100
+--- build.xml.orig	2009-11-07 18:55:41.000000000 +0100
++++ build.xml	2009-11-07 18:58:17.000000000 +0100
 @@ -75,13 +75,13 @@
-     </junit>
-   </target>
- 
--  <target name="dist" depends="clean,compile,javadoc">
-+  <target name="jar" depends="compile">
-     <mkdir dir="${dist}"/>
-     <!-- Runtime jar -->
-     <jar basedir="${build}/classes"
-          excludes="net/sourceforge/jtds/test/*.class"
-          includes="**/*"
--         jarfile="${build}/${ant.project.name}-${version}.jar">
-+         jarfile="${build}/${ant.project.name}.jar">
-         <manifest>
-             <attribute name="Implementation-Title" value="jTDS JDBC Driver"/>
-             <attribute name="Implementation-Version" value="${version}"/>
-@@ -91,6 +91,9 @@
-             <attribute name="Class-Path" value="jcifs.jar" />
-         </manifest>
-     </jar>
+     </junit>

+   </target>

+ 

+-  <target name="dist" depends="clean,compile,javadoc">

++  <target name="jar" depends="compile">

+     <mkdir dir="${dist}"/>

+     <!-- Runtime jar -->

+     <jar basedir="${build}/classes"

+          excludes="net/sourceforge/jtds/test/*.class"

+          includes="**/*"

+-         jarfile="${build}/${ant.project.name}-${version}.jar">

++         jarfile="${build}/${ant.project.name}.jar">

+         <manifest>

+             <attribute name="Implementation-Title" value="jTDS JDBC Driver"/>

+             <attribute name="Implementation-Version" value="${version}"/>

+@@ -92,6 +92,10 @@
+             <attribute name="Main-Class" value="net.sourceforge.jtds.jdbc.Driver"/>

+         </manifest>

+     </jar>

++    
 +    </target>
 +    
-+    <target name="dist" depends="jar,clean,javadoc">
- 
-     <!-- Source package -->
-     <copy todir="${dist}/tmp/doc">
-@@ -122,4 +125,10 @@
-     <delete dir="${dist}/tmp"/>
-   </target>
- 
-+        <!-- zip the sources -->
-+        <target name="sourcezip">
-+                <zip destfile="${dist}/${ant.project.name}-src.zip">
-+                        <zipfileset dir="${src}/main" />
-+                </zip>
-+        </target>
- </project>
++    <target name="dist" depends="jar">

+ 

+     <!-- Source package -->

+     <copy todir="${dist}/tmp/doc">

diff --git a/dev-java/jtds/files/buildxml-gentoo.patch b/dev-java/jtds/files/buildxml-gentoo.patch
deleted file mode 100644
index a9b5d9f35666..000000000000
--- a/dev-java/jtds/files/buildxml-gentoo.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- build.xml.orig	2004-12-21 17:30:09.560666880 +0100
-+++ build.xml	2004-12-21 17:35:21.167295472 +0100
-@@ -44,7 +44,7 @@
-   </target>
- 
-   <target name="compile" depends="init,prepare">
--    <javac destdir="${build}/classes" srcdir="${build}/src" classpathref="libs" debug="${javac.debug}" optimize="${javac.optimize}" />
-+    <javac destdir="${build}/classes" srcdir="${build}/src" classpathref="libs" debug="${javac.debug}" optimize="${javac.optimize}" source="1.4" target="1.4"/>
-   </target>
- 
-   <target name="javadoc" depends="prepare">
-@@ -57,31 +57,12 @@
-     </javadoc>
-   </target>
- 
--  <target name="test" depends="compile">
--    <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
--
--    <junit fork="no" haltonfailure="no" printsummary="yes">
--      <classpath>
--        <pathelement location="build/classes"/>
--        <path refid="libs"/>
--      </classpath>
--      <formatter type="plain"/>
--      <batchtest>
--        <fileset dir="${build}/src">
--          <include name="**/*Test.java"/>
--          <exclude name="**/AllTests.java"/>
--        </fileset>
--      </batchtest>
--    </junit>
--  </target>
--
--  <target name="dist" depends="clean,compile,javadoc">
--    <mkdir dir="${dist}"/>
-+  <target name="jar" depends="compile">
-     <!-- Runtime jar -->
-     <jar basedir="${build}/classes"
-          excludes="net/sourceforge/jtds/test/*.class"
-          includes="**/*"
--         jarfile="${build}/${ant.project.name}-${version}.jar">
-+         jarfile="${build}/${ant.project.name}.jar">
-         <manifest>
-             <attribute name="Implementation-Title" value="jTDS JDBC Driver"/>
-             <attribute name="Implementation-Version" value="${version}"/>
-@@ -91,31 +72,6 @@
-             <attribute name="Class-Path" value="jcifs.jar" />
-         </manifest>
-     </jar>
--
--    <!-- Source package -->
--    <copy todir="${dist}/tmp/doc">
--      <fileset dir="${build}/doc" includes="**/*"/>
--    </copy>
--    <mkdir dir="${dist}/tmp"/>
--    <copy todir="${dist}/tmp">
--      <fileset dir="." includes="README,README.XA,CHANGELOG,LICENSE,*.bat,*.sh,*.xml,src/**/*,lib/**/*,html/**/*,conf/**/*"/>
--    </copy>
--    <zip basedir="${dist}/tmp" includes="**/*" zipfile="${dist}/${ant.project.name}-${version}-src.zip"/>
--    <delete dir="${dist}/tmp"/>
--
--    <!-- Binary package -->
--    <mkdir dir="${dist}/tmp"/>
--    <copy todir="${dist}/tmp">
--      <fileset dir="." includes="README,README.XA,CHANGELOG,LICENSE,conf/**/*.xml,html/**/*"/>
--      <fileset dir="${build}" includes="*.jar"/>
--    </copy>
--    <mkdir dir="${dist}/tmp/XA"/>
--    <copy todir="${dist}/tmp/XA">
--      <fileset dir="lib" includes="*.dll"/>
--      <fileset dir="src/XA" includes="*.sql"/>
--    </copy>
--    <zip basedir="${dist}/tmp" includes="**/*" zipfile="${dist}/${ant.project.name}-${version}-dist.zip"/>
--    <delete dir="${dist}/tmp"/>
-   </target>
--
-+  
- </project>