Bumps for sequence, svnkit and svnclientadapter. jna copied, bumped and improved from java-experimental.

svn path=/java-overlay/; revision=6298

11 files changed, 370 insertions, 284 deletions

diff --git a/dev-util/svnclientadapter/ChangeLog b/dev-util/svnclientadapter/ChangeLog
index 6767a9e2..d3d66aa0 100644
--- a/dev-util/svnclientadapter/ChangeLog
+++ b/dev-util/svnclientadapter/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for dev-util/svnclientadapter
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Jun 2008; James Le Cuirot <chewi@aura-online.co.uk>
+  -svnclientadapter-1.2.0.ebuild, -svnclientadapter-1.2.0-build.xml.patch,
+  +svnclientadapter-1.2.4.ebuild, +svnclientadapter-1.2.4-build.xml.patch:
+  Version bump. Some tests still fail.
+
   25 Feb 2007; Miroslav Šulc <fordfrog@gentoo.org>
   +svnclientadapter-1.2.0.ebuild,
   +files/svnclientadapter-1.2.0-build.xml.patch, +metadata.xml:
diff --git a/dev-util/svnclientadapter/Manifest b/dev-util/svnclientadapter/Manifest
index 82e6c712..fdd5d378 100644
--- a/dev-util/svnclientadapter/Manifest
+++ b/dev-util/svnclientadapter/Manifest
@@ -1,20 +1,5 @@
-AUX svnclientadapter-1.2.0-build.xml.patch 2297 RMD160 873a3548b4ed24745b7cc130de2daaa61891b156 SHA1 bd451d201f3f0e18185703cbd3772ee90bd80555 SHA256 6b7fba144c23dc5f65ad454d70c6d06d262fca9c18c732d049731e6124193b34
-MD5 b8000d9755a9c4331142d9927f137508 files/svnclientadapter-1.2.0-build.xml.patch 2297
-RMD160 873a3548b4ed24745b7cc130de2daaa61891b156 files/svnclientadapter-1.2.0-build.xml.patch 2297
-SHA256 6b7fba144c23dc5f65ad454d70c6d06d262fca9c18c732d049731e6124193b34 files/svnclientadapter-1.2.0-build.xml.patch 2297
-DIST subclipse-source_1.2.0.zip 4095797 RMD160 4d0208283585990206110311a0a13b9a67a94097 SHA1 5348da06d2123305eabb98ec18c12cbc5ea162c2 SHA256 9a85c60d419456bf7641f9f8975141d86f1a50a6278bb9f5c49fd7cd38f2f78f
-EBUILD svnclientadapter-1.2.0.ebuild 1371 RMD160 1802736bdbf96374c6196fe767d03ae9827af75e SHA1 66712b5d01ceb6cc63af02c3e689be7bb0168a52 SHA256 b4d4e8dea2b7ca9fd83b964c913ae0fde612f5fd63621b3e3dc7d08fce6edd11
-MD5 bf4d5499c45f469ead5cf43670d9db4b svnclientadapter-1.2.0.ebuild 1371
-RMD160 1802736bdbf96374c6196fe767d03ae9827af75e svnclientadapter-1.2.0.ebuild 1371
-SHA256 b4d4e8dea2b7ca9fd83b964c913ae0fde612f5fd63621b3e3dc7d08fce6edd11 svnclientadapter-1.2.0.ebuild 1371
-MISC ChangeLog 362 RMD160 16785f2db2ec049be0e9516d452c0802282915a8 SHA1 fe038aa4a36ef634a4c34e3e56b7c324387950b4 SHA256 e81629bd72757e026fd95dff8819f10c81e4c98c675d4c8a31f1f600d31d68de
-MD5 205354a35ea19b595df3c4bb5e6a24c3 ChangeLog 362
-RMD160 16785f2db2ec049be0e9516d452c0802282915a8 ChangeLog 362
-SHA256 e81629bd72757e026fd95dff8819f10c81e4c98c675d4c8a31f1f600d31d68de ChangeLog 362
+AUX svnclientadapter-1.2.4-build.xml.patch 409 RMD160 018cd01966b44a8c5d05a138752aa6cc76ef1308 SHA1 e1e941ec0e1f53c76eda01ac058b78fd26622db3 SHA256 4124e3e0c218994ee56b104e84d26d394047f5bf64301acbda285b0635f52c73
+DIST subclipse-source_1.2.4.zip 4106046 RMD160 665a2da614f486a7bd581448aa7cf342e2dd2bec SHA1 fdef30bd4128614dc39a5dcebd35fa31d3e2e5ac SHA256 0c94d238f4c85660d53d254d0432c604371b83c83212ee2c54955c830f4ab24c
+EBUILD svnclientadapter-1.2.4.ebuild 1204 RMD160 e59e2dc09c702b40087012e64dbdd464c915fe2b SHA1 7f14875480affb80ac2e5e6561d3d22cb804b470 SHA256 e62ef124f971d41e2430dd306130d33b32c594d477cafa9d001e90ab83aaeb38
+MISC ChangeLog 609 RMD160 0f720f9eea7819ba4aa3287be92682b8ddc73543 SHA1 c4ef7f28b62d2e005423c9c227767e5c6e91e5ca SHA256 29b8386878ee802a71112346ca0673a4145b6088ca4ddb521f009de17c0b027c
 MISC metadata.xml 217 RMD160 6a03b58e975ef9766c1ba359b8cf73372aae1409 SHA1 9661e29f710f8b88d1ebad0d7cfa2716ae869b51 SHA256 00a5772b0da0819b665dba21d321e4e2393c818907d38678d179cafd5036c7f2
-MD5 a28ef1dbcd9ec5d985e36f5b538891b5 metadata.xml 217
-RMD160 6a03b58e975ef9766c1ba359b8cf73372aae1409 metadata.xml 217
-SHA256 00a5772b0da0819b665dba21d321e4e2393c818907d38678d179cafd5036c7f2 metadata.xml 217
-MD5 053d913591de112f0c6f6a54c67859a7 files/digest-svnclientadapter-1.2.0 262
-RMD160 0d2c439bb1f24e6ba0ece42c22cdeddc9d795a79 files/digest-svnclientadapter-1.2.0 262
-SHA256 1753e4455cda272b3c18d665be887eb15b5a3d867f3f793503c41450d3c34473 files/digest-svnclientadapter-1.2.0 262
diff --git a/dev-util/svnclientadapter/files/svnclientadapter-1.2.0-build.xml.patch b/dev-util/svnclientadapter/files/svnclientadapter-1.2.0-build.xml.patch
deleted file mode 100644
index acb938f8..00000000
--- a/dev-util/svnclientadapter/files/svnclientadapter-1.2.0-build.xml.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- build.xml.original	2007-02-25 13:12:45.000000000 +0100
-+++ build.xml	2007-02-25 19:42:06.000000000 +0100
-@@ -11,6 +11,8 @@
-     <pathelement location="${svnjavahl.jar}"/>

-   	<pathelement location="${svnkit.jar}"/>

-   	<pathelement location="${ganymed.jar}"/>

-+  	<pathelement location="${junit.jar}"/>

-+  	<pathelement location="${sequence.jar}"/>

-   </path>

- 

-   <!-- ================================================================= -->

-@@ -112,11 +114,13 @@
-   <!-- ================================================================= -->

-   <!-- Define custom tasks for the unit tests (e.g. code coverage)       -->

-   <!-- ================================================================= -->

-+  <!--

-   <path id="emma.lib" >

-     <pathelement location="${test.lib.dir}/emma.jar" />

-     <pathelement location="${test.lib.dir}/emma_ant.jar" />

-   </path>

-   <taskdef resource="emma_ant.properties" classpathref="emma.lib" />

-+  -->

- 	

-   <!-- ================================================================= -->

-   <!-- run junit tests                                                   -->

-@@ -132,7 +136,6 @@
-         <pathelement location="${build.classes.dir}"/>

-       	<pathelement location="${build.testClasses.dir}"/>

-         <path refid="project.classpath"/>	

--        <path refid="emma.lib" />

-       </classpath>

-       <jvmarg value="-Demma.coverage.out.file=${coverage.dir}/coverage.emma" />

-       <jvmarg value="-Demma.coverage.out.merge=true" />

-@@ -148,7 +151,6 @@
-         <pathelement location="${build.classes.dir}"/>

-         <pathelement location="${build.testClasses.dir}"/>

-         <path refid="project.classpath"/>	

--        <path refid="emma.lib" />

-       </classpath>

-       <jvmarg value="-Demma.coverage.out.file=${coverage.dir}/coverage.emma" />

-       <jvmarg value="-Demma.coverage.out.merge=true" />

-@@ -190,6 +192,7 @@
-   	<!-- run the EMMA instrumentation -->

-     <delete dir="${emma.instrClasses.dir}"/>

-     <mkdir dir="${emma.instrClasses.dir}" />

-+    <!--

-     <emma enabled="${emma.enabled}" >

-       <instr instrpath="${build.classes.dir}"

-              destdir="${emma.instrClasses.dir}"

-@@ -197,6 +200,7 @@
-              merge="true"

-       />

-     </emma>

-+    -->

-   </target>

- 

- </project>

diff --git a/dev-util/svnclientadapter/files/svnclientadapter-1.2.4-build.xml.patch b/dev-util/svnclientadapter/files/svnclientadapter-1.2.4-build.xml.patch
new file mode 100644
index 00000000..2701a6cd
--- /dev/null
+++ b/dev-util/svnclientadapter/files/svnclientadapter-1.2.4-build.xml.patch
@@ -0,0 +1,10 @@
+--- build.xml.orig	2006-11-15 05:18:40.000000000 +0000
++++ build.xml	2008-06-11 00:15:43.933996421 +0100
+@@ -11,6 +11,7 @@
+     <pathelement location="${svnjavahl.jar}"/>

+   	<pathelement location="${svnkit.jar}"/>

+   	<pathelement location="${ganymed.jar}"/>

++        <pathelement path="${gentoo.classpath}"/>

+   </path>

+ 

+   <!-- ================================================================= -->

diff --git a/dev-util/svnclientadapter/svnclientadapter-1.2.0.ebuild b/dev-util/svnclientadapter/svnclientadapter-1.2.0.ebuild
deleted file mode 100644
index 2cb8e36f..00000000
--- a/dev-util/svnclientadapter/svnclientadapter-1.2.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A high-level Java API for Subversion"
-HOMEPAGE="http://subclipse.tigris.org/svnClientAdapter.html"
-SRC_URI="http://subclipse.tigris.org/files/documents/906/36427/subclipse-source_1.2.0.zip"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="Apache-1.1"
-
-IUSE="test"
-
-COMMON_DEPEND="
-	dev-java/ganymed-ssh2
-	>=dev-util/subversion-1.4
-	dev-util/svnkit"
-
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant
-	source? ( app-arch/zip )
-	test? (
-		=dev-java/junit-3.8*
-		dev-java/sequence
-	)
-	${COMMON_DEPEND}"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPEND}"
-
-S="${WORKDIR}/svnClientAdapter"
-
-EANT_BUILD_TARGET="svnClientAdapter.jar"
-EANT_DOC_TARGET="javadoc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-build.xml.patch
-
-	mkdir lib
-	cd lib
-	java-pkg_jar-from ganymed-ssh2 ganymed-ssh2.jar ganymed.jar
-	java-pkg_jar-from svnkit svnkit.jar
-	java-pkg_jar-from subversion svn-javahl.jar svnjavahl.jar
-}
-
-src_test() {
-	eant runTests -Djunit.jar=$(java-pkg_getjars junit) -Dsequence.jar=$(java-pkg_getjars sequence)
-}
-
-src_install() {
-	java-pkg_dojar build/lib/svnClientAdapter.jar
-	use doc && java-pkg_dojavadoc build/javadoc
-	use source && java-pkg_dosrc src
-	dodoc changelog.txt readme.txt
-}
diff --git a/dev-util/svnclientadapter/svnclientadapter-1.2.4.ebuild b/dev-util/svnclientadapter/svnclientadapter-1.2.4.ebuild
new file mode 100644
index 00000000..ac231741
--- /dev/null
+++ b/dev-util/svnclientadapter/svnclientadapter-1.2.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+JAVA_PKG_IUSE="doc source"
+WANT_ANT_TASKS="ant-junit ant-nodeps"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A high-level Java API for Subversion"
+HOMEPAGE="http://subclipse.tigris.org/svnClientAdapter.html"
+SRC_URI="http://subclipse.tigris.org/files/documents/906/39521/subclipse-source_${PV}.zip"
+KEYWORDS="~amd64"
+SLOT="0"
+LICENSE="Apache-2.0"
+IUSE="test"
+
+CDEPEND="=dev-util/subversion-1.4*
+	dev-util/svnkit"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.4
+	test? ( dev-java/sequence )"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.4"
+
+S="${WORKDIR}/svnClientAdapter"
+
+EANT_BUILD_TARGET="svnClientAdapter.jar"
+EANT_DOC_TARGET="javadoc"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+
+	mkdir -p lib || die
+	java-pkg_jar-from --into lib --with-dependencies svnkit,subversion
+	ln -snf svn-javahl.jar lib/svnjavahl.jar
+}
+
+src_install() {
+	java-pkg_dojar build/lib/svnClientAdapter.jar
+	use doc && java-pkg_dojavadoc build/javadoc
+	use source && java-pkg_dosrc src
+	dodoc changelog.txt readme.txt
+}
+
+src_test() {
+	EANT_GENTOO_CLASSPATH="sequence" eant runTests
+}
diff --git a/dev-util/svnkit/ChangeLog b/dev-util/svnkit/ChangeLog
index ad4ad5ca..de418bd4 100644
--- a/dev-util/svnkit/ChangeLog
+++ b/dev-util/svnkit/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for dev-util/svnkit
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Jun 2008; James Le Cuirot <chewi@aura-online.co.uk>
+  -svnkit-1.1.3.ebuild, -files/svnkit-1.1.3-build.xml.patch,
+  +svnkit-1.1.7.ebuild, -files/svnkit-1.1.7-build.xml.patch:
+  Version bump. Doesn't build with subversion-1.5.
+
   06 Jul 2007; Petteri Räty <betelgeuse@gentoo.org> svnkit-1.1.3.ebuild:
   Call java-pkg-2_pkg_setup in pkg_setup.
 
diff --git a/dev-util/svnkit/Manifest b/dev-util/svnkit/Manifest
index 1c0cf7c8..6607a580 100644
--- a/dev-util/svnkit/Manifest
+++ b/dev-util/svnkit/Manifest
@@ -1,5 +1,5 @@
-AUX svnkit-1.1.3-build.xml.patch 4945 RMD160 9224f2f60661c48787e3b8a7e0d1748d66b32fb3 SHA1 d5839995515e09d817e35a3f96e23029568a3f79 SHA256 e6077b9f166ff78532e74e2d33fb3b6f9b2a5d99fa9eda637cf6f78bca3fd652
-DIST org.tmatesoft.svn_1.1.3.src.zip 2441240 RMD160 fe4ee2e13a4ebd97033c5335e5aa9fb126d62b96 SHA1 f4284e34625482c2a66535b372a34d3913722a01 SHA256 14c84f590e9c63df7648919f11b308cfe1f26b54b67c7bb2827d17b4c8e3ab8b
-EBUILD svnkit-1.1.3.ebuild 1290 RMD160 796edf2406c23356512a94dc2df7b9f12ed6dfc9 SHA1 7cbc8646e584f372462a5067acd10470535781e6 SHA256 0a91bb6402c4df5bc739287a9660b2f542259fd98b2fa9b62453902f2926b45f
-MISC ChangeLog 968 RMD160 c25644a4c0d0ec72881ad9fca03592bf469bc730 SHA1 40a765047be9d86676fd517a6cda180c5d95b44a SHA256 1903493bac26e14bf38ef58a10e153717cc24e42b58396772c268154327cd0c0
+AUX svnkit-1.1.7-build.xml.patch 11735 RMD160 7580f4d933bc125e516ce8a8187e90d044dd4f79 SHA1 17f75feeac772cb3734a97c4a93fe631c8687ed4 SHA256 ab988cbcd6d8e83424ed4dfa86481e874a5645d54309a08093e0362e5355e833
+DIST org.tmatesoft.svn_1.1.7.src.zip 3779502 RMD160 aa2dac0856cdd04b015c0b824c399878cf7cb59e SHA1 ceba9f578907b80b6d0f385e044f02554c46bb81 SHA256 f834ab82828e61819009bc92c041abbaf43edaf7cc4d74b975938a32b2a860f9
+EBUILD svnkit-1.1.7.ebuild 1240 RMD160 f89606b70f0fefa57652e9e72f12f71f3483994a SHA1 1643782cf4d9461f8d6a31df0fc0891587e4db21 SHA256 ee5b29484e96a780d7050b62bd2b31ac3bb4e579e24664550c938008ee023a17
+MISC ChangeLog 1199 RMD160 cee695554f951435af2dcbf6c3807e4dea47d7c6 SHA1 96021152f953848d47b5f1f7fcc9d473cb488bfa SHA256 c13d4d24b84813c202e181d6e030ebe177a141d0bfc9b122314eabc1a65bbe18
 MISC metadata.xml 217 RMD160 6a03b58e975ef9766c1ba359b8cf73372aae1409 SHA1 9661e29f710f8b88d1ebad0d7cfa2716ae869b51 SHA256 00a5772b0da0819b665dba21d321e4e2393c818907d38678d179cafd5036c7f2
diff --git a/dev-util/svnkit/files/svnkit-1.1.3-build.xml.patch b/dev-util/svnkit/files/svnkit-1.1.3-build.xml.patch
deleted file mode 100644
index 58765504..00000000
--- a/dev-util/svnkit/files/svnkit-1.1.3-build.xml.patch
+++ /dev/null
@@ -1,119 +0,0 @@
---- build.xml.orig	2007-06-14 19:24:40.000000000 +0200
-+++ build.xml	2007-07-05 16:22:35.000000000 +0200
-@@ -28,21 +28,14 @@
- 

-     <target name="compile-library">

-         <mkdir dir="svnkit/bin" />

--        <mkdir dir="contrib/javahl/bin" />

--        <mkdir dir="contrib/sequence/bin" />

- 

-         <path id="library.classpath">

--            <pathelement location="contrib/ganymed/ganymed.jar" />

--            <pathelement path="contrib/javahl/bin" />

--            <pathelement path="contrib/sequence/bin" />

-+		<fileset dir="contrib">

-+			<include name="**/*.jar"/>

-+		</fileset>

-         </path>

- 

--        <javac debug="true" destdir="contrib/javahl/bin" srcdir="contrib/javahl/src">

--            <exclude name="**/SVNClient.java" />

--            <exclude name="**/SVNAdmin.java" />

--            <exclude name="org/tigris/subversion/javahl/tests/**" />

--        </javac>

--        <javac debug="true" destdir="contrib/sequence/bin" srcdir="contrib/sequence/src" />

-+

-         <javac debug="true"

-                destdir="svnkit/bin"

-                srcdir="svnkit/src"

-@@ -106,24 +99,12 @@
-         <mkdir dir="contrib/sequence/bin-test" />

-         <mkdir dir="svnkit-test/bin" />

-         <path id="tests.classpath">

--            <pathelement location="contrib/ganymed/ganymed.jar" />

--            <pathelement location="contrib/junit/junit.jar" />

--            <pathelement path="contrib/javahl/bin" />

--            <pathelement path="contrib/sequence/bin" />

--            <pathelement path="contrib/sequence/bin-test" />

-+		<fileset dir="contrib">

-+			<include name="**/*.jar"/>

-+		</fileset>

-             <pathelement path="svnkit/bin" />

-         </path>

- 

--        <path id="sequence.tests.classpath">

--            <pathelement location="contrib/junit/junit.jar" />

--            <pathelement path="contrib/sequence/bin" />

--        </path>

--

--        <javac debug="true"

--               destdir="contrib/sequence/bin-test"

--               srcdir="contrib/sequence/src-test"

--               classpathref="sequence.tests.classpath"

--        />

-         <javac debug="true"

-                destdir="svnkit-test/bin"

-                srcdir="svnkit-test/src"

-@@ -149,10 +130,7 @@
-             <fileset dir="build/lib" >

-                 <include name="svnkit.build.properties" />

-             </fileset>

--        	<fileset dir="contrib/sequence">

--                <include name="SEQUENCE-LICENSE" />

--        	</fileset>

--            <fileset dir="contrib/sequence/bin" />

-+

-             <fileset dir="svnkit/src">

-                 <include name="org/tmatesoft/svn/core/internal/wc/config/**" />

-                 <include name="org/tmatesoft/svn/core/io/repository/**" />

-@@ -160,22 +138,7 @@
-                 <include name="org/tmatesoft/svn/core/wc/xml/schema/**" />

-             </fileset>

-         </jar>

--        <jar destfile="build/lib/svnkit-javahl.jar">

--            <fileset dir="svnkit/bin">

--                <include name="org/tigris/**" />

--            </fileset>

--            <fileset dir="contrib/javahl/bin" >

--                <exclude name="org/tigris/subversion/javahl/tests/**" />

--                <exclude name="org/tigris/subversion/javahl/SVNClient.class" />

--                <exclude name="org/tigris/subversion/javahl/SVNClient$*.class" />

--                <exclude name="org/tigris/subversion/javahl/SVNAdmin.class" />

--                <exclude name="org/tigris/subversion/javahl/SVNAdmin$*.class" />

--            </fileset>

--            <fileset dir="contrib/javahl">

--                <include name="JAVAHL-LICENSE" />

--            </fileset>

--        </jar>

--        <copy file="contrib/ganymed/ganymed.jar" todir="build/lib" />

-+	

-         <copy file="svnkit/native/jsvncrypt.dll" todir="build/lib" />

-     	<!-- copy licences and changelog -->

-         <copy todir="build/lib" flatten="true">

-@@ -183,9 +146,6 @@
-                 <include name="changelog.txt" />

-                 <include name="README.txt" />

-                 <include name="COPYING" />

--                <include name="contrib/javahl/JAVAHL-LICENSE" />

--                <include name="contrib/sequence/SEQUENCE-LICENSE" />

--                <include name="contrib/ganymed/GANYMED-LICENSE" />

-             </fileset>

-         </copy>

-     </target>

-@@ -495,11 +455,13 @@
- 

-     <target name="test-java" depends="init-environment,compile-tests">

-         <path id="test.classpath">

--            <pathelement path="contrib/junit/junit.jar" />

-+

-             <pathelement path="svnkit/bin" />

--            <pathelement path="contrib/sequence/bin" />

-+	    	<fileset dir="contrib">

-+			<include name="**/*.jar"/>

-+		</fileset>

-             <pathelement path="svnkit-test/bin" />

--            <pathelement path="contrib/sequence/bin-test" />

-+

-         </path>

-         <java classpathref="test.classpath"

-               dir="svnkit-test"

diff --git a/dev-util/svnkit/files/svnkit-1.1.7-build.xml.patch b/dev-util/svnkit/files/svnkit-1.1.7-build.xml.patch
new file mode 100644
index 00000000..6b53436b
--- /dev/null
+++ b/dev-util/svnkit/files/svnkit-1.1.7-build.xml.patch
@@ -0,0 +1,267 @@
+--- build.xml.orig	2008-06-10 18:04:15.046644512 +0100
++++ build.xml	2008-06-10 18:05:24.808644429 +0100
+@@ -28,22 +28,13 @@
+ 
+     <target name="compile-library">
+         <mkdir dir="svnkit/bin" />
+-        <mkdir dir="contrib/javahl/bin" />
+-        <mkdir dir="contrib/sequence/bin" />
+ 
+         <path id="library.classpath">
+-            <pathelement location="contrib/trilead/trilead.jar" />
+-            <pathelement location="contrib/jna/jna.jar" />
+-            <pathelement path="contrib/javahl/bin" />
+-            <pathelement path="contrib/sequence/bin" />
++            <fileset dir="contrib"> 
++                <include name="**/*.jar"/> 
++            </fileset> 
+         </path>
+ 
+-        <javac debug="true" destdir="contrib/javahl/bin" srcdir="contrib/javahl/src">
+-            <exclude name="**/SVNClient.java" />
+-            <exclude name="**/SVNAdmin.java" />
+-            <exclude name="org/tigris/subversion/javahl/tests/**" />
+-        </javac>
+-        <javac debug="true" destdir="contrib/sequence/bin" srcdir="contrib/sequence/src" />
+         <javac debug="true"
+                destdir="svnkit/bin"
+                srcdir="svnkit/src"
+@@ -56,10 +47,9 @@
+ 
+         <target name="compile-library-eclipse" depends="init-environment" if="eclipse.present"> 
+         <path id="library-eclipse.classpath">
+-            <pathelement location="contrib/trilead/trilead.jar" />
+-            <pathelement location="contrib/jna/jna.jar" />
+-            <pathelement path="contrib/javahl/bin" />
+-            <pathelement path="contrib/sequence/bin" />
++            <fileset dir="contrib"> 
++                <include name="**/*.jar"/> 
++            </fileset>
+                 <fileset dir="${eclipse.home}/plugins">
+                 <include name="**/*.jar"/>
+                 </fileset>
+@@ -106,28 +96,14 @@
+     </target>
+ 
+     <target name="compile-tests" depends="compile-library, compile-library-eclipse">
+-        <mkdir dir="contrib/sequence/bin-test" />
+         <mkdir dir="svnkit-test/bin" />
+         <path id="tests.classpath">
+-            <pathelement location="contrib/trilead/trilead.jar" />
+-            <pathelement location="contrib/jna/jna.jar" />
+-            <pathelement location="contrib/junit/junit.jar" />
+-            <pathelement path="contrib/javahl/bin" />
+-            <pathelement path="contrib/sequence/bin" />
+-            <pathelement path="contrib/sequence/bin-test" />
++            <fileset dir="contrib"> 
++                <include name="**/*.jar"/> 
++            </fileset> 
+             <pathelement path="svnkit/bin" />
+         </path>
+ 
+-        <path id="sequence.tests.classpath">
+-            <pathelement location="contrib/junit/junit.jar" />
+-            <pathelement path="contrib/sequence/bin" />
+-        </path>
+-
+-        <javac debug="true"
+-               destdir="contrib/sequence/bin-test"
+-               srcdir="contrib/sequence/src-test"
+-               classpathref="sequence.tests.classpath"
+-        />
+         <javac debug="true"
+                destdir="svnkit-test/bin"
+                srcdir="svnkit-test/src"
+@@ -153,10 +129,6 @@
+             <fileset dir="build/lib" >
+                 <include name="svnkit.build.properties" />
+             </fileset>
+-                <fileset dir="contrib/sequence">
+-                <include name="SEQUENCE-LICENSE" />
+-                </fileset>
+-            <fileset dir="contrib/sequence/bin" />
+             <fileset dir="svnkit/src">
+                 <include name="org/tmatesoft/svn/core/internal/wc/config/**" />
+                 <include name="org/tmatesoft/svn/core/io/repository/**" />
+@@ -168,19 +140,7 @@
+             <fileset dir="svnkit/bin">
+                 <include name="org/tigris/**" />
+             </fileset>
+-            <fileset dir="contrib/javahl/bin" >
+-                <exclude name="org/tigris/subversion/javahl/tests/**" />
+-                <exclude name="org/tigris/subversion/javahl/SVNClient.class" />
+-                <exclude name="org/tigris/subversion/javahl/SVNClient$*.class" />
+-                <exclude name="org/tigris/subversion/javahl/SVNAdmin.class" />
+-                <exclude name="org/tigris/subversion/javahl/SVNAdmin$*.class" />
+-            </fileset>
+-            <fileset dir="contrib/javahl">
+-                <include name="JAVAHL-LICENSE" />
+-            </fileset>
+         </jar>
+-        <copy file="contrib/trilead/trilead.jar" todir="build/lib" />
+-        <copy file="contrib/jna/jna.jar" todir="build/lib" />
+         <!-- copy licences and changelog -->
+         <copy todir="build/lib" flatten="true">
+             <fileset dir=".">
+@@ -188,10 +148,6 @@
+                 <include name="README.txt" />
+                 <include name="THIRD-PARTY.txt" />
+                 <include name="COPYING" />
+-                <include name="contrib/jna/JNA-LICENSE" />
+-                <include name="contrib/javahl/JAVAHL-LICENSE" />
+-                <include name="contrib/sequence/SEQUENCE-LICENSE" />
+-                <include name="contrib/trilead/TRILEAD-LICENSE" />
+             </fileset>
+         </copy>
+     </target>
+@@ -222,26 +178,12 @@
+         <zip destfile="build/lib/svnkitsrc.zip">
+             <fileset dir="svnkit/src" />
+             <fileset dir="svnkit-eclipse/org.tmatesoft.svnkit/src" />
+-            <fileset dir="contrib/javahl/src">
+-                <exclude name="org/tigris/subversion/javahl/SVNAdmin.java"/>
+-                <exclude name="org/tigris/subversion/javahl/SVNClient.java"/>
+-            </fileset>
+-            <fileset dir="contrib/sequence/src" />
+             <fileset dir="${basedir}" >
+                 <include name="COPYING" />
+             </fileset>
+             <fileset dir="build/lib" >
+                 <include name="svnkit.build.properties" />
+             </fileset>
+-            <fileset dir="contrib/javahl" >
+-                <include name="JAVAHL-LICENSE" />
+-            </fileset>
+-            <fileset dir="contrib/jna" >
+-                <include name="JNA-LICENSE" />
+-            </fileset>
+-            <fileset dir="contrib/sequence" >
+-                <include name="SEQUENCE-LICENSE" />
+-            </fileset>
+         </zip>
+     </target>
+ 
+@@ -307,9 +249,10 @@
+         <copy file="doc/javadoc-files/info.png" todir="build/doc/javadoc"/>
+ 
+         <path id="doc.classpath">
++            <fileset dir="contrib"> 
++                <include name="**/*.jar"/> 
++            </fileset> 
+             <pathelement path="svnkit/bin" />
+-            <pathelement path="contrib/sequence/bin" />
+-            <pathelement path="contrib/javahl/bin" />
+                 </path>
+         <javadoc destdir="build/doc/javadoc" failonerror="false"
+                  windowtitle="JavaDoc :: Documentation :: Pure Java Subversion (SVN) Client Library"
+@@ -341,9 +284,6 @@
+         <!-- delete all compiled classes -->
+         <delete>
+             <fileset dir=".">
+-                <include name="contrib/javahl/bin/**" />
+-                <include name="contrib/sequence/bin/**" />
+-                <include name="contrib/sequence/bin-test/**" />
+                 <include name="svnkit/bin/**" />
+                 <include name="svnkit-eclipse/bin/**" />
+                 <include name="svnkit-test/bin/**" />
+@@ -405,28 +345,12 @@
+                 <include name="org/tmatesoft/svn/core/internal/wc/config/**" />
+                 <include name="org/tmatesoft/svn/core/io/repository/**" />
+                         </fileset>
+-                        <fileset dir="contrib/javahl/bin">
+-                <exclude name="org/tigris/subversion/javahl/SVNClient**" />
+-                <exclude name="org/tigris/subversion/javahl/SVNAdmin**" />
+-                        </fileset>
+-                        <fileset dir="contrib/sequence/bin">
+-                                <include name="**"/>
+-                        </fileset>
+             <fileset dir="${basedir}" >
+                 <include name="COPYING" />
+             </fileset>
+             <fileset dir="build/lib" >
+                 <include name="svnkit.build.properties" />
+             </fileset>
+-            <fileset dir="contrib/javahl" >
+-                <include name="JAVAHL-LICENSE" />
+-            </fileset>
+-            <fileset dir="contrib/jna" >
+-                <include name="JNA-LICENSE" />
+-            </fileset>
+-            <fileset dir="contrib/sequence" >
+-                <include name="SEQUENCE-LICENSE" />
+-            </fileset>
+                 </jar>
+ 
+                 <jar destfile="build/maven/svnkit-${build.number}-sources.jar">
+@@ -443,31 +367,12 @@
+                                 <exclude name=".svn"/>
+                                 <exclude name=".svn/**"/>
+                         </fileset>
+-                        <fileset dir="contrib/javahl/src">
+-                                <exclude name=".svn"/>
+-                                <exclude name=".svn/**"/>
+-                <exclude name="org/tigris/subversion/javahl/SVNClient.java" />
+-                <exclude name="org/tigris/subversion/javahl/SVNAdmin.java" />
+-                        </fileset>
+-                        <fileset dir="contrib/sequence/src">
+-                                <exclude name=".svn"/>
+-                                <exclude name=".svn/**"/>
+-                        </fileset>
+             <fileset dir="${basedir}" >
+                 <include name="COPYING" />
+             </fileset>
+             <fileset dir="build/lib" >
+                 <include name="svnkit.build.properties" />
+             </fileset>
+-            <fileset dir="contrib/javahl" >
+-                <include name="JAVAHL-LICENSE" />
+-            </fileset>
+-            <fileset dir="contrib/jna" >
+-                <include name="JNA-LICENSE" />
+-            </fileset>
+-            <fileset dir="contrib/sequence" >
+-                <include name="SEQUENCE-LICENSE" />
+-            </fileset>
+                 </jar>
+                 
+                 <copy file="pom.xml" tofile="build/maven/pom.xml"></copy>
+@@ -514,11 +419,6 @@
+                 <exclude name="**/bin/**" />
+                 <exclude name="bin/**" />
+             </zipfileset>
+-            <zipfileset dir="contrib" prefix="svnkit-src-${build.number}/contrib">
+-                <exclude name="**/.svn" />
+-                <exclude name="**/bin/**" />
+-                <exclude name="bin/**" />
+-            </zipfileset>
+             <zipfileset dir="." prefix="svnkit-src-${build.number}">
+                 <include name=".settings/*" />
+                 <include name="*.*" />
+@@ -531,11 +431,11 @@
+ 
+     <target name="test-java" depends="init-environment,compile-tests">
+         <path id="test.classpath">
+-            <pathelement path="contrib/junit/junit.jar" />
++            <fileset dir="contrib"> 
++                <include name="**/*.jar"/> 
++            </fileset> 
+             <pathelement path="svnkit/bin" />
+-            <pathelement path="contrib/sequence/bin" />
+             <pathelement path="svnkit-test/bin" />
+-            <pathelement path="contrib/sequence/bin-test" />
+         </path>
+         <java classpathref="test.classpath"
+               dir="svnkit-test"
+@@ -594,9 +494,11 @@
+         <replace token="%ant.dir%" value="${basedir.unix}" file="${python.test.home}/python/cmdline/svntest/main.py"></replace>
+ 
+         <path id="python.classpath">
++            <fileset dir="contrib"> 
++                <include name="**/*.jar"/> 
++            </fileset> 
+             <pathelement path="build/lib/svnkit.jar" />
+             <pathelement path="build/lib/svnkit-cli.jar" />
+-            <pathelement path="contrib/junit/junit.jar" />
+             <pathelement path="svnkit-test/bin" />
+         </path>
+ 
diff --git a/dev-util/svnkit/svnkit-1.1.3.ebuild b/dev-util/svnkit/svnkit-1.1.7.ebuild
index cd2f7258..1853f225 100644
--- a/dev-util/svnkit/svnkit-1.1.3.ebuild
+++ b/dev-util/svnkit/svnkit-1.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -14,23 +14,26 @@ SLOT="0"
 LICENSE="tmate"
 IUSE=""
 
-COMMON_DEPEND="
-	dev-java/ganymed-ssh2
+CDEPEND="=dev-util/subversion-1.4*
+	dev-java/trilead-ssh2
 	dev-java/sequence
-	>=dev-util/subversion-1.4"
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEPEND}"
+	dev-java/jna"
 
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPEND}"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.4"
 
-S="${WORKDIR}/${PN}-src-${PV}"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.4"
+
+S="${WORKDIR}/${PN}-src-${PV}.4142"
+
+EANT_BUILD_TARGET="build-library build-cli"
+EANT_DOC_TARGET="build-doc"
 
 pkg_setup() {
 	java-pkg-2_pkg_setup
-	if ! built_with_use dev-util/subversion java; then
-		msg="${CATEGORY}/${P} needs dev-util/subversion built with the java"
-		msg="${msg} use flag"
+	if ! built_with_use dev-util/subversion java ; then
+		msg="${CATEGORY}/${P} needs dev-util/subversion built with the java USE flag"
 		error ${msg}
 		die ${msg}
 	fi
@@ -38,18 +41,14 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
+	
 	cd "${S}"
-	epatch ${FILESDIR}/${P}-build.xml.patch
-	rm -vr contrib/* || die
-	cd contrib || die
-	java-pkg_jar-from ganymed-ssh2
-	java-pkg_jar-from sequence
-	java-pkg_jar-from subversion
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+	
+	rm -r contrib/* || die
+	java-pkg_jar-from --into contrib jna,trilead-ssh2,sequence,subversion
 }
 
-EANT_BUILD_TARGET="build-library build-cli"
-EANT_DOC_TARGET="build-doc"
-
 src_install() {
 	cd build/lib
 	java-pkg_dojar *.jar
@@ -57,5 +56,5 @@ src_install() {
 
 	cd "${S}"
 	use doc && java-pkg_dojavadoc build/doc/javadoc
-	use source && java-pkg_dosource svnkit/src/*
+	use source && java-pkg_dosrc svnkit/src/*
 }