Version bump. Now needs java 1.6.

Package-Manager: portage-2.2_rc48/cvs/Linux x86_64

5 files changed, 87 insertions, 129 deletions

diff --git a/dev-java/jtds/ChangeLog b/dev-java/jtds/ChangeLog
index 36a52a5ed513..4925aae94e81 100644
--- a/dev-java/jtds/ChangeLog
+++ b/dev-java/jtds/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jtds
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/ChangeLog,v 1.20 2008/03/22 02:45:18 betelgeuse Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/ChangeLog,v 1.21 2009/11/07 18:05:57 caster Exp $
+
+*jtds-1.2.4 (07 Nov 2009)
+
+  07 Nov 2009; Vlastimil Babka <caster@gentoo.org>
+  -files/1.0.2-buildxml.patch, +jtds-1.2.4.ebuild,
+  +files/1.2.4-buildxml.patch, -files/buildxml-gentoo.patch:
+  Version bump. Now needs java 1.6.
 
   22 Mar 2008; Petteri Räty <betelgeuse@gentoo.org> jtds-1.2-r2.ebuild:
   RESTRICT test for the upcoming generic src_test as they need a running server.
diff --git a/dev-java/jtds/Manifest b/dev-java/jtds/Manifest
index 71431e074be2..b18245a0db8c 100644
--- a/dev-java/jtds/Manifest
+++ b/dev-java/jtds/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 1.0.2-buildxml.patch 1293 RMD160 038e2137062b3361fc564802a3accd18e101c7e2 SHA1 b7c2a36d3b710eb78efa619fe8a997fb79d857ed SHA256 d73040e2fc0722ba1a2a1f56dd13df9aa49d684be98c52ade02ea95b396ef250
 AUX 1.0.3-buildxml.patch 1043 RMD160 5637eae6ac7368fbeae32d5aa112ca018f4892cf SHA1 1380eddf27bf8c5f992b1d727ebf1d640cf53648 SHA256 34810830f3aa1fd43bf21957c4c05bfe7f409ad7e229bd912f5cc0a67445dc45
 AUX 1.2-com.sun.patch 1474 RMD160 102af5a075184de8df0396f142b6e7e061c84322 SHA1 13c7ea250ab8ba747d6662acf95f7681c5b06354 SHA256 cbc223c0ea7df88db087133bc4d65be4e660833dbb540801f4699d7b78f51bea
-AUX buildxml-gentoo.patch 2919 RMD160 09e8138ccf2b60bd797afbf11fa77f50c7e1cead SHA1 a86a6397a2b5f39664e93dc7b84395a2e5ef24a3 SHA256 ad850b2cc62eaf90163af5285044e359fda7baac582fca744135290d0a0c1b79
+AUX 1.2.4-buildxml.patch 1009 RMD160 32cc43a3a9077cdcae2c3c0f003226114b25720d SHA1 320e2e6de6bd613fcfe3e57e8c3fd1dbd185b064 SHA256 79cb55d1a57b7d6d1f89ace77ddf71a3248ac213adb1e2059d7ebc2d4701fa88
 DIST jtds-1.2-src.zip 3489215 RMD160 b7f79995090201af570239b5105d5ced030174f3 SHA1 3ed957b7f39f15f705e5f2940d4819521951b79f SHA256 60020866fec76fc246db5eaafc894a2348ac2d910139da8e9be91d23362d9b4e
+DIST jtds-1.2.4-src.zip 3875862 RMD160 83a8bc3a0a5936cef2c8c098d948c9f20b861e74 SHA1 e7995f9ca5090dde5eb9ed3bc7d0871e61d9b57c SHA256 a47e8ae732287a3e693a0663e221bac1b71ba4548754b246ad827bd2cda748cf
 EBUILD jtds-1.2-r2.ebuild 1328 RMD160 86af1c3b8f15d1f96b226ed91f9acf1e6175fdc9 SHA1 7d87e3f052758c2024a41e951054b9e393f84055 SHA256 10bbd896cade8082313930a179e78f125dd5b02963d3238b9b743dc89b256c25
-MISC ChangeLog 3101 RMD160 374b0755f3fffe0ec86c75dbb20a3fbbdc569feb SHA1 183321aa38fde3824a35ec47e8cfb0acbc1a60a3 SHA256 897ddfa07df9f88826a64f77e74cd914b37373fb1bffd7d777dc09ff464c52e3
+EBUILD jtds-1.2.4.ebuild 1109 RMD160 fd7963ec8a90a8483aa595cef0b24d6dd34832b2 SHA1 afc95ce0276af86bc4a6787052b3badb46154a9c SHA256 fa358886210c1cd08e458fdcc86a61e7f71c76036ab60ad55a0f22a39166c937
+MISC ChangeLog 3324 RMD160 7a02ac5b8bb724887d9351c8ddd0c193623939de SHA1 8cfe1169c61dad175083c319ef795ac81de07fab SHA256 303eb135299fc80881df7363592a188197c8858a5ce4f97d3c55f198ec418e0b
 MISC metadata.xml 723 RMD160 a8eba5dcbd226dabdb5f5fd37ef2fe97d0c1fa22 SHA1 9bb88523639e9a355414c80113a426342d66ba14 SHA256 465dd20f6c462d27f6ea146e8e74123b9fcb70d59476e7f2be93f5b32d71d47a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiTZEQACgkQoeSe8B0zEfyzLQCeMjeromXxPXqWirgw0R2LDMra
-i2EAn2fH3CUx608NFqMW6+GI3fYvtzhx
-=uu/G
------END PGP SIGNATURE-----
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>
diff --git a/dev-java/jtds/jtds-1.2.4.ebuild b/dev-java/jtds/jtds-1.2.4.ebuild
new file mode 100644
index 000000000000..5dca52dcbf35
--- /dev/null
+++ b/dev-java/jtds/jtds-1.2.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/jtds-1.2.4.ebuild,v 1.1 2009/11/07 18:05:57 caster Exp $
+
+EAPI=2
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="jTDS - SQL Server and Sybase JDBC driver"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
+HOMEPAGE="http://jtds.sourceforge.net"
+LICENSE="LGPL-2.1"
+SLOT="1.2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+COMMON_DEPEND="
+	=dev-java/jcifs-1*
+	dev-java/junit:0"
+DEPEND=">=virtual/jdk-1.6
+	${COMMON_DEPEND}
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEPEND}"
+
+S=${WORKDIR}
+IUSE=""
+
+# Would need a running server
+RESTRICT="test"
+
+java_prepare() {
+	epatch "${FILESDIR}/1.2.4-buildxml.patch"
+
+	cd "${S}/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from jcifs-1.1
+	#TODO: don't always build tests
+	java-pkg_jar-from junit
+}
+
+src_install() {
+	java-pkg_dojar build/*.jar
+
+	dodoc CHANGELOG README* || die "Failed to install docs."
+	use doc && java-pkg_dojavadoc build/doc
+	use source && java-pkg_dosrc "${S}"/src/main/*
+}