5 files changed, 157 insertions, 2 deletions
diff --git a/dev-java/jtds/ChangeLog b/dev-java/jtds/ChangeLog
index e75ccb5fa626..d43feeed177a 100644
--- a/dev-java/jtds/ChangeLog
+++ b/dev-java/jtds/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/jtds
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/ChangeLog,v 1.30 2011/08/07 11:59:16 xarthisius Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/ChangeLog,v 1.31 2012/10/30 19:24:54 sera Exp $
+
+*jtds-1.3.0 (30 Oct 2012)
+*jtds-1.2.5-r1 (30 Oct 2012)
+
+  30 Oct 2012; Ralph Sennhauser <sera@gentoo.org> +jtds-1.2.5-r1.ebuild,
+  +files/jtds-1.2.5-build.xml.patch, +jtds-1.3.0.ebuild,
+  +files/jtds-1.3.0-build.xml.patch:
+  Revbump to restrict to java 6. #440010
+  Version bump for java 7.
 
   07 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> jtds-1.2.4.ebuild,
   jtds-1.2.5.ebuild:
diff --git a/dev-java/jtds/files/jtds-1.2.5-build.xml.patch b/dev-java/jtds/files/jtds-1.2.5-build.xml.patch
new file mode 100644
index 000000000000..333197fbb4c2
--- /dev/null
+++ b/dev-java/jtds/files/jtds-1.2.5-build.xml.patch
@@ -0,0 +1,29 @@
+--- 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}"/>
+@@ -92,6 +92,10 @@
+             <attribute name="Main-Class" value="net.sourceforge.jtds.jdbc.Driver"/>
+         </manifest>
+     </jar>
++    
++    </target>
++    
++    <target name="dist" depends="jar">
+ 
+     <!-- Source package -->
+     <copy todir="${dist}/tmp/doc">
diff --git a/dev-java/jtds/files/jtds-1.3.0-build.xml.patch b/dev-java/jtds/files/jtds-1.3.0-build.xml.patch
new file mode 100644
index 000000000000..9b3e3cb6901d
--- /dev/null
+++ b/dev-java/jtds/files/jtds-1.3.0-build.xml.patch
@@ -0,0 +1,13 @@
+--- build.xml
++++ build.xml
+@@ -117,7 +117,9 @@
+     </junit>
+   </target>
+ 
+-  <target name="dist" depends="clean,compile,javadoc">
++  <target name="dist" depends="clean,jar,javadoc"/>
++
++  <target name="jar" depends="compile">
+     <mkdir dir="${dist}"/>
+ 
+     <!-- runtime jar -->
diff --git a/dev-java/jtds/jtds-1.2.5-r1.ebuild b/dev-java/jtds/jtds-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..f863d4b20a9d
--- /dev/null
+++ b/dev-java/jtds/jtds-1.2.5-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/jtds-1.2.5-r1.ebuild,v 1.1 2012/10/30 19:24:54 sera Exp $
+
+EAPI=5
+
+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 ~x86"
+IUSE=""
+
+# Would need a running server
+RESTRICT="test"
+
+COMMON_DEPEND="
+	dev-java/jcifs:1.1"
+RDEPEND="${COMMON_DEPEND}
+	virtual/jre:1.6"
+DEPEND="${COMMON_DEPEND}
+	virtual/jdk:1.6
+	app-arch/unzip"
+
+S=${WORKDIR}
+
+java_prepare() {
+	find -name '*.jar' -exec rm -v {} + || die
+
+	epatch "${FILESDIR}"/${P}-build.xml.patch
+
+	rm -vr ./src/test/net/sourceforge/jtds/test || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+EANT_GENTOO_CLASSPATH="jcifs-1.1"
+
+src_install() {
+	java-pkg_dojar build/${PN}.jar
+
+	dodoc CHANGELOG README*
+	use doc && java-pkg_dojavadoc build/doc
+	use source && java-pkg_dosrc "${S}"/src/main/*
+}
diff --git a/dev-java/jtds/jtds-1.3.0.ebuild b/dev-java/jtds/jtds-1.3.0.ebuild
new file mode 100644
index 000000000000..acbaa1f1f97f
--- /dev/null
+++ b/dev-java/jtds/jtds-1.3.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/jtds-1.3.0.ebuild,v 1.1 2012/10/30 19:24:54 sera Exp $
+
+EAPI=5
+
+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.3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Would need a running server
+RESTRICT="test"
+
+COMMON_DEPEND="
+	dev-java/jcifs:1.1"
+RDEPEND="${COMMON_DEPEND}
+	virtual/jre:1.7"
+DEPEND="${COMMON_DEPEND}
+	virtual/jdk:1.7
+	app-arch/unzip"
+
+S=${WORKDIR}
+
+java_prepare() {
+	find -name '*.jar' -exec rm -v {} + || die
+
+	epatch "${FILESDIR}"/${P}-build.xml.patch
+
+	mkdir -p build/doc || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+EANT_GENTOO_CLASSPATH="jcifs-1.1"
+
+src_install() {
+	java-pkg_newjar build/${P}.jar
+
+	dodoc CHANGELOG README*
+	use doc && java-pkg_dojavadoc build/doc
+	use source && java-pkg_dosrc "${S}"/src/main/*
+}