Migrate 1.2 to generation 2 and relax dev-java/jcifs dependency for 1.2.13 version bump.

Package-Manager: portage-2.1.2.4

8 files changed, 113 insertions, 35 deletions

diff --git a/dev-java/jtds/ChangeLog b/dev-java/jtds/ChangeLog
index a27d0e87862f..bfb308841e8e 100644
--- a/dev-java/jtds/ChangeLog
+++ b/dev-java/jtds/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jtds
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/ChangeLog,v 1.9 2007/02/18 10:24:16 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/ChangeLog,v 1.10 2007/04/25 17:42:17 betelgeuse Exp $
+
+*jtds-1.2-r1 (25 Apr 2007)
+
+  25 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> jtds-0.9.1.ebuild,
+  jtds-1.0.3.ebuild, jtds-1.2.ebuild, +jtds-1.2-r1.ebuild:
+  Migrate 1.2 to generation 2 and relax dev-java/jcifs dependency for 1.2.13
+  version bump.
 
   18 Feb 2007; nixnut <nixnut@gentoo.org> jtds-0.9.1.ebuild:
   Stable on ppc wrt bug 160569
diff --git a/dev-java/jtds/Manifest b/dev-java/jtds/Manifest
index 648bc3f85616..d56230844389 100644
--- a/dev-java/jtds/Manifest
+++ b/dev-java/jtds/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.0.2-buildxml.patch 1293 RMD160 038e2137062b3361fc564802a3accd18e101c7e2 SHA1 b7c2a36d3b710eb78efa619fe8a997fb79d857ed SHA256 d73040e2fc0722ba1a2a1f56dd13df9aa49d684be98c52ade02ea95b396ef250
 MD5 8e7fbdf02cfe16bde704f6ea7a76f60d files/1.0.2-buildxml.patch 1293
 RMD160 038e2137062b3361fc564802a3accd18e101c7e2 files/1.0.2-buildxml.patch 1293
@@ -13,26 +16,30 @@ SHA256 ad850b2cc62eaf90163af5285044e359fda7baac582fca744135290d0a0c1b79 files/bu
 DIST jtds-0.9.1-src.zip 2736422 RMD160 449270bb013839f44ff6a55973b73f430153f4e8 SHA1 9e3a9aca08a67ab9fdd9b5619fa86453cc0cfa29 SHA256 4090b4409443da740ecd28a29556d07bc66c4d4b3d4c55f64e8d3e33538aac8f
 DIST jtds-1.0.3-src.zip 3411524 RMD160 ea153b1d034fb853ef0a8140f6844963cd25fc53 SHA1 56f9f2adfa4935ac2214de84fe6a77117b13186d SHA256 30334562eb8a95d720fbafa20272026268f160ddead392b16802d70ce9a0faad
 DIST jtds-1.2-src.zip 3489215 RMD160 b7f79995090201af570239b5105d5ced030174f3 SHA1 3ed957b7f39f15f705e5f2940d4819521951b79f SHA256 60020866fec76fc246db5eaafc894a2348ac2d910139da8e9be91d23362d9b4e
-EBUILD jtds-0.9.1.ebuild 1384 RMD160 73470f2d48ac5be9b46abcabb017c0078adb1306 SHA1 13ec5bfcbb4529648b286fde4d3932d08d293388 SHA256 afc541e09c7d7ceed5043ed70578938af79b2a20b80156c1f3ba4bca0cfc1897
-MD5 5dbf6cb5b8515b7eba4303690f7eed9e jtds-0.9.1.ebuild 1384
-RMD160 73470f2d48ac5be9b46abcabb017c0078adb1306 jtds-0.9.1.ebuild 1384
-SHA256 afc541e09c7d7ceed5043ed70578938af79b2a20b80156c1f3ba4bca0cfc1897 jtds-0.9.1.ebuild 1384
-EBUILD jtds-1.0.3.ebuild 1412 RMD160 55c1b7be5869085ef71127afb7704e9ae4135db3 SHA1 b09d9944dcfecfe4c16138cb27e615392229c2f1 SHA256 fdb07a31a551509f2cfef038ccf1034be75aa2f82b0b47b0c9fefb9a6ba10adc
-MD5 050b500864d72d1f71af69a787615ccf jtds-1.0.3.ebuild 1412
-RMD160 55c1b7be5869085ef71127afb7704e9ae4135db3 jtds-1.0.3.ebuild 1412
-SHA256 fdb07a31a551509f2cfef038ccf1034be75aa2f82b0b47b0c9fefb9a6ba10adc jtds-1.0.3.ebuild 1412
-EBUILD jtds-1.2.ebuild 1300 RMD160 f7ef4ef67a76d7521ceaed9f9a1166d5f9bf44cf SHA1 dee472b6912e4f451e98c798b1776a5d2d149369 SHA256 93bc4a638d726b1e515ddf435dee2cf51436f64f44456e9d975e804ce0ddffa1
-MD5 62dd4abc8de9c7c029f6bf6589e5ed9b jtds-1.2.ebuild 1300
-RMD160 f7ef4ef67a76d7521ceaed9f9a1166d5f9bf44cf jtds-1.2.ebuild 1300
-SHA256 93bc4a638d726b1e515ddf435dee2cf51436f64f44456e9d975e804ce0ddffa1 jtds-1.2.ebuild 1300
-MISC ChangeLog 1565 RMD160 307104996c244dfe8a93ebb3ec45582a16f83766 SHA1 ca0b68e25f5447996d6a84e1b90e263ddc411d88 SHA256 e93068e5f229318f2411204db04601796d5404fea03106de12eafbbd73f68a70
-MD5 3c789bb1b83a5d1cc6e7ad272e320cc1 ChangeLog 1565
-RMD160 307104996c244dfe8a93ebb3ec45582a16f83766 ChangeLog 1565
-SHA256 e93068e5f229318f2411204db04601796d5404fea03106de12eafbbd73f68a70 ChangeLog 1565
-MISC metadata.xml 734 RMD160 296a926eed8efe2b24b033b0f7b6c007994ebbd0 SHA1 dbca5e00df6e1cbc281818c2b08cfbdbca1568b2 SHA256 d973d5ac668960a7f6390717e5eb714d605a429787cdc66378287123256cddf2
-MD5 5160ef2dd424a31e8938c7080a66d496 metadata.xml 734
-RMD160 296a926eed8efe2b24b033b0f7b6c007994ebbd0 metadata.xml 734
-SHA256 d973d5ac668960a7f6390717e5eb714d605a429787cdc66378287123256cddf2 metadata.xml 734
+EBUILD jtds-0.9.1.ebuild 1386 RMD160 5147beb0bb78bf36f8296e82b386b77a22384dbe SHA1 50965fc1b647bbd261197ccc00db78372a4beebc SHA256 e27a32a816fc2d7e85055edb87213ce0a924853fe6bcc293a8c75976231d9715
+MD5 56d2e31102d6eee4f6f583e3621583cb jtds-0.9.1.ebuild 1386
+RMD160 5147beb0bb78bf36f8296e82b386b77a22384dbe jtds-0.9.1.ebuild 1386
+SHA256 e27a32a816fc2d7e85055edb87213ce0a924853fe6bcc293a8c75976231d9715 jtds-0.9.1.ebuild 1386
+EBUILD jtds-1.0.3.ebuild 1411 RMD160 7f0a51bae9c8c81c736690a2317e5dab95656b66 SHA1 49ab388965d89094b71fabe3e7ee0129d221c526 SHA256 0b3dc85f5c6830d4e121f69cb1028919ba5df113a6ae1f7a271000e91a3b3925
+MD5 c5e890718299583717188ac8a7dad5b4 jtds-1.0.3.ebuild 1411
+RMD160 7f0a51bae9c8c81c736690a2317e5dab95656b66 jtds-1.0.3.ebuild 1411
+SHA256 0b3dc85f5c6830d4e121f69cb1028919ba5df113a6ae1f7a271000e91a3b3925 jtds-1.0.3.ebuild 1411
+EBUILD jtds-1.2-r1.ebuild 1130 RMD160 3339db0ef78ca85aef06eee564cf4b0c09f4ff5e SHA1 f08a872b9e36397105089ef36dbf69a1e8e3c1ee SHA256 103520202fbd0e95a3facd655fb099d998b1c7f91431498b42d3925eef4c99e6
+MD5 53098bc5b3f9e7667830ab0c9eb532f0 jtds-1.2-r1.ebuild 1130
+RMD160 3339db0ef78ca85aef06eee564cf4b0c09f4ff5e jtds-1.2-r1.ebuild 1130
+SHA256 103520202fbd0e95a3facd655fb099d998b1c7f91431498b42d3925eef4c99e6 jtds-1.2-r1.ebuild 1130
+EBUILD jtds-1.2.ebuild 1298 RMD160 e1679a5d19033445de7593b054b7067060d26ed0 SHA1 0d651a1dada0a023a7df98b1dab51dba1e58a7d0 SHA256 47bd50ddd9357092e881e2a5c2da2dee46c47c98e9c600b7a6bef8e365d01cd9
+MD5 e36b3b17cc91e4a0091661440c17f7b1 jtds-1.2.ebuild 1298
+RMD160 e1679a5d19033445de7593b054b7067060d26ed0 jtds-1.2.ebuild 1298
+SHA256 47bd50ddd9357092e881e2a5c2da2dee46c47c98e9c600b7a6bef8e365d01cd9 jtds-1.2.ebuild 1298
+MISC ChangeLog 1823 RMD160 c69f40c28145e046e91692c32d2042fa9e36815e SHA1 1555b562b76bda48d9080819775111cd5330eb21 SHA256 14c4f1146b1f2d9a82b43528ebeba90370da75313aeb83bec665f3e4d8845347
+MD5 b40e134a05a1848ad0f63f2c2e602b42 ChangeLog 1823
+RMD160 c69f40c28145e046e91692c32d2042fa9e36815e ChangeLog 1823
+SHA256 14c4f1146b1f2d9a82b43528ebeba90370da75313aeb83bec665f3e4d8845347 ChangeLog 1823
+MISC metadata.xml 728 RMD160 394d832af5454401e1f5e382465b1e05d2367e98 SHA1 ba2c17315d21d6afe07a1739b8e180cd84db7a3a SHA256 3e7b67c3c3850d9f00d6c036ae8f77d1346462bbb479f4fb82a732976220a3a7
+MD5 18b4e0bc9665a646af0bec4688bad602 metadata.xml 728
+RMD160 394d832af5454401e1f5e382465b1e05d2367e98 metadata.xml 728
+SHA256 3e7b67c3c3850d9f00d6c036ae8f77d1346462bbb479f4fb82a732976220a3a7 metadata.xml 728
 MD5 033a25fbaaf640f083fcab7e3f9522ba files/digest-jtds-0.9.1 238
 RMD160 d9b40fb6a262c47f36598c81cd823f748d039a1d files/digest-jtds-0.9.1 238
 SHA256 8f11cb562ab3d9749bf6f41683d71ee164af6c122789869b474be29a2bc5a9dc files/digest-jtds-0.9.1 238
@@ -42,3 +49,13 @@ SHA256 9157e41c9474d34e3ffb72e90eb75d4ed0c020a44a765e7d6f1059bd905b477b files/di
 MD5 65195690fbb916cdb0855d4386d78a67 files/digest-jtds-1.2 232
 RMD160 87453400508e3fcef8eefd6c7caa12303a03ee91 files/digest-jtds-1.2 232
 SHA256 cdbec460ca437522dad0326270f0f5ed226518c75318147d4886e276d3a8a4eb files/digest-jtds-1.2 232
+MD5 65195690fbb916cdb0855d4386d78a67 files/digest-jtds-1.2-r1 232
+RMD160 87453400508e3fcef8eefd6c7caa12303a03ee91 files/digest-jtds-1.2-r1 232
+SHA256 cdbec460ca437522dad0326270f0f5ed226518c75318147d4886e276d3a8a4eb files/digest-jtds-1.2-r1 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGL5L7cxLzpIGCsLQRAu57AJ4j4/opI6pYnszc8JbHMn0R35xifQCeLMjy
+sZRgf5ZxfdiCcFppVtKPmzE=
+=0CE6
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jtds/files/digest-jtds-1.2-r1 b/dev-java/jtds/files/digest-jtds-1.2-r1
new file mode 100644
index 000000000000..5e0ddfe8879d
--- /dev/null
+++ b/dev-java/jtds/files/digest-jtds-1.2-r1
@@ -0,0 +1,3 @@
+MD5 900ebcbf2eaa502f85dc7e2d44abfc94 jtds-1.2-src.zip 3489215
+RMD160 b7f79995090201af570239b5105d5ced030174f3 jtds-1.2-src.zip 3489215
+SHA256 60020866fec76fc246db5eaafc894a2348ac2d910139da8e9be91d23362d9b4e jtds-1.2-src.zip 3489215
diff --git a/dev-java/jtds/jtds-0.9.1.ebuild b/dev-java/jtds/jtds-0.9.1.ebuild
index 21d74dfae1f7..337df8db59cb 100644
--- a/dev-java/jtds/jtds-0.9.1.ebuild
+++ b/dev-java/jtds/jtds-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/jtds-0.9.1.ebuild,v 1.6 2007/02/18 10:24:16 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/jtds-0.9.1.ebuild,v 1.7 2007/04/25 17:42:17 betelgeuse Exp $
 
 inherit eutils java-pkg
 
@@ -18,7 +18,7 @@ DEPEND=">=virtual/jdk-1.4
 RDEPEND=">=virtual/jre-1.4
 	>=dev-java/ant-1.6.2
 	=dev-java/crimson-1.1*
-	=dev-java/jcifs-1.1*
+	=dev-java/jcifs-1*
 	>=dev-java/jta-1.0.1
 	>=dev-java/junit-3.8"
 
diff --git a/dev-java/jtds/jtds-1.0.3.ebuild b/dev-java/jtds/jtds-1.0.3.ebuild
index 6789f491fd18..9ee91a828799 100644
--- a/dev-java/jtds/jtds-1.0.3.ebuild
+++ b/dev-java/jtds/jtds-1.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/jtds-1.0.3.ebuild,v 1.1 2005/04/24 19:21:26 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/jtds-1.0.3.ebuild,v 1.2 2007/04/25 17:42:17 betelgeuse Exp $
 
 inherit eutils java-pkg
 
@@ -19,7 +19,7 @@ DEPEND=">=virtual/jdk-1.4
 RDEPEND=">=virtual/jre-1.4
 	>=dev-java/ant-1.6.2
 	=dev-java/crimson-1.1*
-	=dev-java/jcifs-1.1*
+	=dev-java/jcifs-1*
 	>=dev-java/jta-1.0.1
 	>=dev-java/junit-3.8"
 
diff --git a/dev-java/jtds/jtds-1.2-r1.ebuild b/dev-java/jtds/jtds-1.2-r1.ebuild
new file mode 100644
index 000000000000..0501230bd136
--- /dev/null
+++ b/dev-java/jtds/jtds-1.2-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/jtds-1.2-r1.ebuild,v 1.1 2007/04/25 17:42:17 betelgeuse Exp $
+
+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="~x86 ~amd64"
+COMMON_DEPEND="
+	=dev-java/jcifs-1*
+	>=dev-java/junit-3.8"
+# does not like javax.sql in >=1.6
+DEPEND="
+	|| (
+		=virtual/jdk-1.5*
+		=virtual/jdk-1.4*
+	)
+	${COMMON_DEPEND}
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPEND}"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch ${FILESDIR}/1.0.3-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/*
+}
diff --git a/dev-java/jtds/jtds-1.2.ebuild b/dev-java/jtds/jtds-1.2.ebuild
index a55abd9da97a..b525d100d56f 100644
--- a/dev-java/jtds/jtds-1.2.ebuild
+++ b/dev-java/jtds/jtds-1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/jtds-1.2.ebuild,v 1.1 2006/01/04 00:12:56 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/jtds-1.2.ebuild,v 1.2 2007/04/25 17:42:17 betelgeuse Exp $
 
 inherit eutils java-pkg
 
@@ -17,7 +17,7 @@ DEPEND=">=virtual/jdk-1.4
 	jikes? ( >=dev-java/jikes-1.21 )
 	source? ( app-arch/zip )"
 RDEPEND=">=virtual/jre-1.4
-	=dev-java/jcifs-1.1*
+	=dev-java/jcifs-1*
 	>=dev-java/junit-3.8"
 
 S=${WORKDIR}
diff --git a/dev-java/jtds/metadata.xml b/dev-java/jtds/metadata.xml
index 368f4d5cf4e9..55fe7eaf1c98 100644
--- a/dev-java/jtds/metadata.xml
+++ b/dev-java/jtds/metadata.xml
@@ -6,12 +6,12 @@
 
 <longdescription>
 
-jTDS is an open source 100% pure Java (type 4) JDBC 3.0 driver for Microsoft SQL 
-Server (6.5, 7, 2000 and 2005) and Sybase (10, 11, 12). jTDS is based on the 
-work of the FreeTDS project and is currently the fastest complete JDBC driver 
-for SQL Server and Sybase. Starting with release 0.9 jTDS is 100% JDBC 3.0 
-compatible, supporting forward-only and scrollable/updateable ResultSets, 
-multiple concurrent (completely independent) Statements per Connection and 
+jTDS is an open source 100% pure Java (type 4) JDBC 3.0 driver for Microsoft SQL
+Server (6.5, 7, 2000 and 2005) and Sybase (10, 11, 12). jTDS is based on the
+work of the FreeTDS project and is currently the fastest complete JDBC driver
+for SQL Server and Sybase. Starting with release 0.9 jTDS is 100% JDBC 3.0
+compatible, supporting forward-only and scrollable/updateable ResultSets,
+multiple concurrent (completely independent) Statements per Connection and
 implementing all the DatabaseMetaData and ResultSetMetaData methods.
 
 </longdescription>