diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2007-07-05 21:41:17 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2007-07-05 21:41:17 +0000 |
| commit | b7cd690db74c9a0cd8ded81a17107d41ad548624 (patch) | |
| tree | 8a84f12a0ab0ba6a315fcab955f746578a6b5b54 /dev-util/svnkit | |
| parent | Ebuild cleanup. (diff) | |
| download | java-b7cd690db74c9a0cd8ded81a17107d41ad548624.tar.gz java-b7cd690db74c9a0cd8ded81a17107d41ad548624.tar.bz2 java-b7cd690db74c9a0cd8ded81a17107d41ad548624.zip | |
Ebuild cleanup and check that subversion is built with java support in pkg_setup.
svn path=/java-overlay/; revision=5233
Diffstat (limited to 'dev-util/svnkit')
| -rw-r--r-- | dev-util/svnkit/ChangeLog | 4 | ||||
| -rw-r--r-- | dev-util/svnkit/Manifest | 4 | ||||
| -rw-r--r-- | dev-util/svnkit/svnkit-1.1.3.ebuild | 30 |
3 files changed, 25 insertions, 13 deletions
diff --git a/dev-util/svnkit/ChangeLog b/dev-util/svnkit/ChangeLog index 828f88eb..be7c1d90 100644 --- a/dev-util/svnkit/ChangeLog +++ b/dev-util/svnkit/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 05 Jul 2007; Petteri Räty <betelgeuse@gentoo.org> svnkit-1.1.3.ebuild: + Ebuild cleanup and check that subversion is built with java support in + pkg_setup. + 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: diff --git a/dev-util/svnkit/Manifest b/dev-util/svnkit/Manifest index 96f71ceb..2b6da266 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 1092 RMD160 463b09471236ceefd4c78e181a644eb133d77153 SHA1 94b10417c5a5cb7040f990ef0545c511e0b8f1ec SHA256 0b7ada597683287efae420f0c3607635d5c156df2c19203d5e82fbef0c43c8ab -MISC ChangeLog 690 RMD160 10bd9062c6e8008fbfbd0735e346ed954ed72403 SHA1 aeef92a0f0178e22c51583a69a833f01afaff53d SHA256 f29fc636e1b26ddd8ccc958d92ff01f6ea3116b5b4d7aad3c34adb98c82fbd5c +EBUILD svnkit-1.1.3.ebuild 1268 RMD160 ae58abf42631ec2e0d6818a0e60934e368ac3932 SHA1 300d6e3b4f8fad3e21f4fd38a803f01c1196bcc9 SHA256 dcc1867a5762b01e9a8cbf4a5252fa1b68998b9d47cf005895fd8f2bb9bd3485 +MISC ChangeLog 851 RMD160 15d996e3feb90698c603a5e867ce294ca41579ac SHA1 f6c963281388c2dac3c652a65961824142a27f37 SHA256 3cdd9266b7cf0509154782315638a55ff472c4d8871d9180fdc13e6f89ff54bc MISC metadata.xml 217 RMD160 6a03b58e975ef9766c1ba359b8cf73372aae1409 SHA1 9661e29f710f8b88d1ebad0d7cfa2716ae869b51 SHA256 00a5772b0da0819b665dba21d321e4e2393c818907d38678d179cafd5036c7f2 diff --git a/dev-util/svnkit/svnkit-1.1.3.ebuild b/dev-util/svnkit/svnkit-1.1.3.ebuild index cc8ce410..8a29c93f 100644 --- a/dev-util/svnkit/svnkit-1.1.3.ebuild +++ b/dev-util/svnkit/svnkit-1.1.3.ebuild @@ -16,10 +16,9 @@ IUSE="" COMMON_DEPEND=" dev-java/ganymed-ssh2 - dev-java/sequence" + dev-java/sequence + >=dev-util/subversion-1.4" DEPEND=">=virtual/jdk-1.4 - >=dev-util/subversion-1.4 - test? ( =dev-java/junit-3.8* ) ${COMMON_DEPEND}" RDEPEND=">=virtual/jre-1.4 @@ -27,26 +26,35 @@ RDEPEND=">=virtual/jre-1.4 S="${WORKDIR}/${PN}-src-${PV}" -EANT_BUILD_TARGET="build-library build-cli" -EANT_DOC_TARGET="build-doc" +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" + error ${msg} + die ${msg} + fi +} src_unpack() { unpack ${A} - cd ${S} + cd "${S}" epatch ${FILESDIR}/${P}-build.xml.patch - rm -fr contrib/* - cd contrib + rm -vr contrib/* || die + cd contrib || die java-pkg_jar-from ganymed-ssh2 java-pkg_jar-from sequence - java-pkg_jar-from --build-only subversion + java-pkg_jar-from subversion } +EANT_BUILD_TARGET="build-library build-cli" +EANT_DOC_TARGET="build-doc" + src_install() { cd build/lib java-pkg_dojar *.jar - dodoc *.txt + dodoc *.txt || die - cd ${S} + cd "${S}" use doc && java-pkg_dojavadoc build/doc/javadoc use source && java-pkg_dosource svnkit/src/* } |