Revbump to restrict to java 6. #440010

Version bump for java 7.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xDA575EB7

6 files changed, 177 insertions, 3 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/Manifest b/dev-java/jtds/Manifest
index 1924b752f4cc..d32e394ef36e 100644
--- a/dev-java/jtds/Manifest
+++ b/dev-java/jtds/Manifest
@@ -1,7 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 1.2.4-buildxml.patch 1009 SHA256 79cb55d1a57b7d6d1f89ace77ddf71a3248ac213adb1e2059d7ebc2d4701fa88 SHA512 6cbee0e153ee66a5f7120ab297784093e4719b057d91fa3e4c36ce63066b71e06509c46b4aa07973675c7c08dd1e9915859344936be1fe9a510c93975202da1d WHIRLPOOL d4f04d37d4c23550d80f31844258f8e408e14e9d22586314bc54e206b0cb5ef94936174b49dec1dd64578b36e46a4aafaa3ea587ae44d63da3fc592d5d053ae9
+AUX jtds-1.2.5-build.xml.patch 1009 SHA256 79cb55d1a57b7d6d1f89ace77ddf71a3248ac213adb1e2059d7ebc2d4701fa88 SHA512 6cbee0e153ee66a5f7120ab297784093e4719b057d91fa3e4c36ce63066b71e06509c46b4aa07973675c7c08dd1e9915859344936be1fe9a510c93975202da1d WHIRLPOOL d4f04d37d4c23550d80f31844258f8e408e14e9d22586314bc54e206b0cb5ef94936174b49dec1dd64578b36e46a4aafaa3ea587ae44d63da3fc592d5d053ae9
+AUX jtds-1.3.0-build.xml.patch 285 SHA256 995cf012aca97c6908186b3a96723d965a9dd17e5e3f5fc3730dd56da46bc6ab SHA512 9ec6a3e92d33ebe5bb62cd25814729b3f95ee1fc4ff9aa72257fc26106d469de431d60f40972f61c2bc193d8b6f7c2ba181f00f11361d6f79b78aa530b34f1bd WHIRLPOOL 84df412ddf7f46a702408c56894d787bab3ae2f32b4bc9fe5aab815f0075e24f3cbfdbbca415c3f9729902a7cf950ed4b3ef496de5910f90ed3dc95f93f137cc
 DIST jtds-1.2.4-src.zip 3875862 SHA256 a47e8ae732287a3e693a0663e221bac1b71ba4548754b246ad827bd2cda748cf SHA512 99f82f247db4b7a9af9d0942e9adf561ff71224a43df38fc4faaa81b04186a6aa770e761678a144fbb22ac3c43c2b535922a214e64ac262c367976bee411ea4e WHIRLPOOL b9ab5fad3cce280b9501ff353e530626c7e146e4e0300888069cf9de901280e859cfe36ec50da2a458b101021940ffb073ecf09eadaa3cad352f49598a203c65
 DIST jtds-1.2.5-src.zip 3953955 SHA256 d86c7244826543d2f2f9cdc1d50888003596c1ec18f30808b21627e8889e9114 SHA512 d2b496a7aac4e4c9c0e164c1514d2d21392024903e1376b13fa6a3396d045a1bfc6a085b2beb1202703a6b6e59e8b534bc82508fcb58c71a25b6a13a3d051eda WHIRLPOOL b5e88e6cdb00f797de1d824a7581d693111d4d746ce6d5a709934ce00befbed4fb4c3b248448715bdf27691c33d8f1cca8ca270e942eb27907cd2567e919084d
+DIST jtds-1.3.0-src.zip 3377646 SHA256 9f500d9eb243e87ef16fbec3909d297b7261893a298646223c9722162ab43c75 SHA512 a07b0a69ecf055a6b2fac0a0cdf3f7562fefb7c4e4c65eed96cc9b667a66b4b4a0de543d904d8a9871031e181c0e75c450afb2f01bfb7a504d1abcd9776216e9 WHIRLPOOL 65707009909715fdfbdcc54b0345c657ec226810414b7d5a3fa08ec04b5eaa11950901221f5934a0e81739cfba70d004368dd7e2a95125d93d981204bd67072e
 EBUILD jtds-1.2.4.ebuild 1099 SHA256 cc8a33dafdc68ddb864fd391395837a7564182c8fe155c32b5125ae86c1973dc SHA512 bd9e970b73ef2149d87c2d5139ee73531d117f64846d46476929cac7702c3929b062b171c0b19f9918cc87a1d7a5fec0b567d7525bffcfe2744da9593102d6f8 WHIRLPOOL b80b049341ecd68efcf71ff7572be5ad85d7c4e64e963e5f1285224e312c0fb78b4389c84c5c58526bc3318cf770a034ab97b1f37dc26011fd020dd8caf555ea
+EBUILD jtds-1.2.5-r1.ebuild 1129 SHA256 be3ab0a230ecc62b452bbf759e140b553ce740559db4b1d2d86c0ad0c161840d SHA512 e836d17042c331ba3a859ac95e070b253c8ce496faadece5aa9affbe12b1e257b489bcb55baf775331c4b1ad5a2f81163328341eadc134c5a21254969a8f6d8e WHIRLPOOL 22f8dc0e7e3c60d900dc9be75927f63cd490a06d3bf4c737350f9a8be3e1d134f5562a998affd215a77c4f2da65fa28dbf59c394c115ecce6660dfcf88e6cb71
 EBUILD jtds-1.2.5.ebuild 1076 SHA256 f2f42caa15f0fbbf1c207e14ee2f23c7b03f5d1ed413ec81ff196e17ef84ba1a SHA512 9df49f6d8dd501eea895af2fd241882a76c6097ee656c7e75bd46a6742c5787678e91db46678019f268cb3de1fb33d68ef4bfc27950c5357b3c0a56b2523b128 WHIRLPOOL c73d9750d74316f6a110b9c0bd8f297866d891fcdc697f3fb56f63622990cbbe81f45454fc4a04200f02f89d7080ea56ee9796200649f3559ad9925e70d86f8f
-MISC ChangeLog 4413 SHA256 3c1547bb54e7ca6c53eec0250c7e3f8339acc1ed4eae02ef03409d3787b3cd4e SHA512 7de8ff8cdb8f597fd279eac3f0c9f618a384cdba684123c9702f9b25b7384556dea108ed4f097e8a2ebed50c518736cb1cb7ec1a08f23ae23a8f7a6fe73d52a3 WHIRLPOOL 09bc24475072d165c23a59ed6ba4e1a350fb1703ff9d23bc138f9847163aba3a7cf590e04ab60c956ce2dc52012c28bc673bc25441b964b15d7210d640769614
+EBUILD jtds-1.3.0.ebuild 1101 SHA256 b9685a1a77738daa071dd91a951a4a2ee658463feb050ff5bd152b7bc7076635 SHA512 3787f33ca16130fbc22bb827bd29ce80760d7e25e33e2d29ca5e3ccd86a90fbadd131840555baf8b3c4b9cfe9d7d2f1c88569b422515ccd2584ab600877aa6a1 WHIRLPOOL a051a179e6e22b667d40e8d6c088030122d0e2e457b742352346d13acaf31a47a1ab03a934997f50c3f7958f3fdd70530ae863400ef6b603fcfbd0afd469b946
+MISC ChangeLog 4699 SHA256 728bf388fb5192383200964cf9d3016dd90c935b9c59ae60eba97e0f5fa258a8 SHA512 6ac532afb026eefe9d2b811b04a11f97a6e038e3f4474ee41f930156263c5f658ae890a7045366e3517a68707c23884b861b0f4f5aeeb4cb8158d791e7c99ca5 WHIRLPOOL f984fbade8a4eda00cde377ce151172cf7b70e9bc95af07b997b1fa21af4b5ed86c718992d39b37bd40fee7439c9677ceaa32aaa30e9c934192d834df5b90580
 MISC metadata.xml 723 SHA256 465dd20f6c462d27f6ea146e8e74123b9fcb70d59476e7f2be93f5b32d71d47a SHA512 f6c39c65fde1f2ef766ddf6a3574fb9fe96122e8789d870678b416755c7497b648e72ff98d12c940fc69392c065eee5d2b3a6b2e7b4e48f89af1d0da32c2d810 WHIRLPOOL 0173482879a754497fee42fbb3247aa6dfc2dd13756866741aee23637cf6a7a1218501e640b646ccf28fe38d3a0a58ec5e006129ca49187442d679892a349463
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQkCmPAAoJEIUJ+svaV163VUoH/iS0GR/EiNI+QghouZ6aXyHM
+NAHNymtGr07I+C6HDx3iAde80PRJMS73hUP2PehwTect9lB1Dueg0XSyjU6vpuZk
+IKAPXladW7gZHMaod2g+DYRdWfUE5EI0eLLJoUbiTKesgBNKl/StG4lVpMS+o3Cv
+W7hWmBaoauvOm+WPG8hH15adX5rmkgDS90fxsow7u+XLpRvxMir8H0/IhTm5G4b1
+NQY0W02OCx9QfJ4KZZfUthqtx2GT47iA2TlHbCnbmlx8TNGby1XnhQoLgsZilsMX
+pZUVJkI9shW1e9X4wOXyidEVhBLAEa75leKGgUl+cKV1oEZFkPm8ejXexzKU6eM=
+=H1zY
+-----END PGP SIGNATURE-----
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/*
+}