aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Noël Rivasseau <elvanor@gentoo.org>2007-07-05 15:29:32 +0000
committerJean-Noël Rivasseau <elvanor@gentoo.org>2007-07-05 15:29:32 +0000
commit83ef15f8f0e3f075a9bf962fe84db1f7ae002282 (patch)
treeb99e0dba1cdd2f827bd4da28c3d4777d24b082df /dev-util
parentstax committed to main tree because dev-java/xstream unit tests need it (diff)
downloadjava-83ef15f8f0e3f075a9bf962fe84db1f7ae002282.tar.gz
java-83ef15f8f0e3f075a9bf962fe84db1f7ae002282.tar.bz2
java-83ef15f8f0e3f075a9bf962fe84db1f7ae002282.zip
Added tmate to licenses, svnkit-1.1.3 version bump
svn path=/java-overlay/; revision=5231
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/svnkit/ChangeLog5
-rw-r--r--dev-util/svnkit/Manifest23
-rw-r--r--dev-util/svnkit/files/svnkit-1.1.3-build.xml.patch (renamed from dev-util/svnkit/files/svnkit-1.1.1-build.xml.patch)44
-rw-r--r--dev-util/svnkit/svnkit-1.1.3.ebuild (renamed from dev-util/svnkit/svnkit-1.1.1.ebuild)8
4 files changed, 39 insertions, 41 deletions
diff --git a/dev-util/svnkit/ChangeLog b/dev-util/svnkit/ChangeLog
index be1006b1..828f88eb 100644
--- a/dev-util/svnkit/ChangeLog
+++ b/dev-util/svnkit/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 05 Jul 2007; Jean-Noël Rivasseau <elvanor@gmail.com>
+ -svnkit-1.1.1.ebuild, -files/svnkit-1.1.1-build.xml.patch,
+ +svnkit-1.1.3.ebuild, +files/svnkit-1.1.3-build.xml.patch:
+ svnkit-1.1.3 version bump, removed the ant-core dependency, changed LICENSE.
+
25 Feb 2007; Miroslav Šulc <fordfrog@gentoo.org> +svnkit-1.1.1.ebuild,
+files/svnkit-1.1.1-build.xml.patch, +metadata.xml:
New ebuild. Used copy from chewi-overlay. Not sure I did it well because it
diff --git a/dev-util/svnkit/Manifest b/dev-util/svnkit/Manifest
index 2e2cb672..96f71ceb 100644
--- a/dev-util/svnkit/Manifest
+++ b/dev-util/svnkit/Manifest
@@ -1,20 +1,5 @@
-AUX svnkit-1.1.1-build.xml.patch 4878 RMD160 30faee9e8facee763713f07c4bfb2102119f4d4c SHA1 ea52b0a6d51c55f38e0dcb2f5a5061389e865712 SHA256 f2b3b770d24aa51e589cb71e680f13c93e6b009c44365b0264bbac28f95cad82
-MD5 f942684312f901b866608e11c35c9372 files/svnkit-1.1.1-build.xml.patch 4878
-RMD160 30faee9e8facee763713f07c4bfb2102119f4d4c files/svnkit-1.1.1-build.xml.patch 4878
-SHA256 f2b3b770d24aa51e589cb71e680f13c93e6b009c44365b0264bbac28f95cad82 files/svnkit-1.1.1-build.xml.patch 4878
-DIST org.tmatesoft.svn_1.1.1.src.zip 2288641 RMD160 9ad6c930f5eef4f64e4b87f6a3b87a039e1920b3 SHA1 9d7a0da1ff4969a19c98da995aca120439dddc4c SHA256 b7d4003cc230ee561d390338f4c200a5ad84a9202a09bd26340c8dfe2589d4a4
-EBUILD svnkit-1.1.1.ebuild 1084 RMD160 d71794dd252bb94ea0d853ee04bfa914c9cd6407 SHA1 cdf5083ee0367da55b3b22c0edd9dc9d7152137c SHA256 49ee95ce21d8dda216a6ab966b56acc6fb4764240f86410ea85327790cbebda1
-MD5 6f9a435c2a20c6b82f696b1799ead96c svnkit-1.1.1.ebuild 1084
-RMD160 d71794dd252bb94ea0d853ee04bfa914c9cd6407 svnkit-1.1.1.ebuild 1084
-SHA256 49ee95ce21d8dda216a6ab966b56acc6fb4764240f86410ea85327790cbebda1 svnkit-1.1.1.ebuild 1084
-MISC ChangeLog 432 RMD160 8247bca4ed8f71f7c3e59b08324656f96c229a5f SHA1 07ef0a088633e01f35ad68c0f0ae4ff1ea4170d7 SHA256 73671c324d2c28238787e93a14daf6b6cfa453afff88fbd6e42e00d4adf21593
-MD5 41ac158dcc8b93ba3dc98b0a93a4c930 ChangeLog 432
-RMD160 8247bca4ed8f71f7c3e59b08324656f96c229a5f ChangeLog 432
-SHA256 73671c324d2c28238787e93a14daf6b6cfa453afff88fbd6e42e00d4adf21593 ChangeLog 432
+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 1092 RMD160 463b09471236ceefd4c78e181a644eb133d77153 SHA1 94b10417c5a5cb7040f990ef0545c511e0b8f1ec SHA256 0b7ada597683287efae420f0c3607635d5c156df2c19203d5e82fbef0c43c8ab
+MISC ChangeLog 690 RMD160 10bd9062c6e8008fbfbd0735e346ed954ed72403 SHA1 aeef92a0f0178e22c51583a69a833f01afaff53d SHA256 f29fc636e1b26ddd8ccc958d92ff01f6ea3116b5b4d7aad3c34adb98c82fbd5c
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 0f487e63c75b82a94fd78699896fb7d0 files/digest-svnkit-1.1.1 277
-RMD160 eb04ebe22fbe8c3ae75925f8c118e051105da497 files/digest-svnkit-1.1.1 277
-SHA256 911a68741586cffd5b18797e93b609caad1d422308727470d450ddf4ec9e05db files/digest-svnkit-1.1.1 277
diff --git a/dev-util/svnkit/files/svnkit-1.1.1-build.xml.patch b/dev-util/svnkit/files/svnkit-1.1.3-build.xml.patch
index dbe77319..58765504 100644
--- a/dev-util/svnkit/files/svnkit-1.1.1-build.xml.patch
+++ b/dev-util/svnkit/files/svnkit-1.1.3-build.xml.patch
@@ -1,6 +1,6 @@
---- build.xml.original 2007-02-25 16:39:32.000000000 +0100
-+++ build.xml 2007-02-25 18:20:56.000000000 +0100
-@@ -24,21 +24,13 @@
+--- 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" />
@@ -11,9 +11,9 @@
- <pathelement location="contrib/ganymed/ganymed.jar" />
- <pathelement path="contrib/javahl/bin" />
- <pathelement path="contrib/sequence/bin" />
-+ <fileset dir="contrib">
-+ <include name="**/*.jar"/>
-+ </fileset>
++ <fileset dir="contrib">
++ <include name="**/*.jar"/>
++ </fileset>
</path>
- <javac debug="true" destdir="contrib/javahl/bin" srcdir="contrib/javahl/src">
@@ -22,10 +22,11 @@
- <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"
-@@ -102,24 +94,12 @@
+@@ -106,24 +99,12 @@
<mkdir dir="contrib/sequence/bin-test" />
<mkdir dir="svnkit-test/bin" />
<path id="tests.classpath">
@@ -34,9 +35,9 @@
- <pathelement path="contrib/javahl/bin" />
- <pathelement path="contrib/sequence/bin" />
- <pathelement path="contrib/sequence/bin-test" />
-+ <fileset dir="contrib">
-+ <include name="**/*.jar"/>
-+ </fileset>
++ <fileset dir="contrib">
++ <include name="**/*.jar"/>
++ </fileset>
<pathelement path="svnkit/bin" />
</path>
@@ -53,17 +54,20 @@
<javac debug="true"
destdir="svnkit-test/bin"
srcdir="svnkit-test/src"
-@@ -140,40 +120,17 @@
+@@ -149,10 +130,7 @@
+ <fileset dir="build/lib" >
<include name="svnkit.build.properties" />
- <include name="COPYING" />
</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">
@@ -82,9 +86,11 @@
- </fileset>
- </jar>
- <copy file="contrib/ganymed/ganymed.jar" todir="build/lib" />
- <!-- copy licences and changelog -->
++
+ <copy file="svnkit/native/jsvncrypt.dll" todir="build/lib" />
+ <!-- copy licences and changelog -->
<copy todir="build/lib" flatten="true">
- <fileset dir=".">
+@@ -183,9 +146,6 @@
<include name="changelog.txt" />
<include name="README.txt" />
<include name="COPYING" />
@@ -94,18 +100,20 @@
</fileset>
</copy>
</target>
-@@ -362,11 +319,11 @@
+@@ -495,11 +455,13 @@
<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" />
++ <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/svnkit-1.1.1.ebuild b/dev-util/svnkit/svnkit-1.1.3.ebuild
index e5b322be..cc8ce410 100644
--- a/dev-util/svnkit/svnkit-1.1.1.ebuild
+++ b/dev-util/svnkit/svnkit-1.1.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://svnkit.com/"
SRC_URI="http://www.svnkit.com/org.tmatesoft.svn_${PV}.src.zip"
KEYWORDS="~amd64 ~x86"
SLOT="0"
-LICENSE="svnkit"
+LICENSE="tmate"
IUSE=""
COMMON_DEPEND="
@@ -19,7 +19,6 @@ COMMON_DEPEND="
dev-java/sequence"
DEPEND=">=virtual/jdk-1.4
>=dev-util/subversion-1.4
- dev-java/ant-core
test? ( =dev-java/junit-3.8* )
${COMMON_DEPEND}"
@@ -39,7 +38,7 @@ src_unpack() {
cd contrib
java-pkg_jar-from ganymed-ssh2
java-pkg_jar-from sequence
- java-pkg_jar-from subversion
+ java-pkg_jar-from --build-only subversion
}
src_install() {
@@ -47,6 +46,7 @@ src_install() {
java-pkg_dojar *.jar
dodoc *.txt
- use doc && java-pkg_dojavadoc doc/javadoc
+ cd ${S}
+ use doc && java-pkg_dojavadoc build/doc/javadoc
use source && java-pkg_dosource svnkit/src/*
}