diff options
| author |   Paul de Vrieze <pauldv@gentoo.org> | 2004-10-09 17:47:35 +0000 |
|---|---|---|
| committer | Paul de Vrieze <pauldv@gentoo.org> | 2004-10-09 17:47:35 +0000 |
| commit | b60381374c574f48bc8a411688be24cbe75ffd76 (patch) | |
| tree | d6ac65e06188dbce7fc181b1c8ebf612e814cd8d /dev-util/subversion | |
| parent | uclibc lovin (Manifest recommit) (diff) | |
| download | gentoo-2-b60381374c574f48bc8a411688be24cbe75ffd76.tar.gz gentoo-2-b60381374c574f48bc8a411688be24cbe75ffd76.tar.bz2 gentoo-2-b60381374c574f48bc8a411688be24cbe75ffd76.zip | |
Fix jikes compilation
Diffstat (limited to 'dev-util/subversion')
| -rw-r--r-- | dev-util/subversion/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/subversion/Manifest | 12 | ||||
| -rw-r--r-- | dev-util/subversion/subversion-1.1.0.ebuild | 12 |
3 files changed, 20 insertions, 9 deletions
diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog index d2eaf033e2fe..62b1e8f71e29 100644 --- a/dev-util/subversion/ChangeLog +++ b/dev-util/subversion/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/subversion # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.108 2004/10/08 12:06:12 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.109 2004/10/09 17:47:35 pauldv Exp $ + + 09 Oct 2004; Paul de Vrieze <pauldv@gentoo.org> subversion-1.1.0.ebuild: + Fix bug #63464 on compilation with jikes. 08 Oct 2004; <pauldv@gentoo.org> subversion-1.1.0.ebuild: Fix bug #66659 concerning the name of the book file. Why doesn't dohtml diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest index 096ad3b655a5..658977cac5b8 100644 --- a/dev-util/subversion/Manifest +++ b/dev-util/subversion/Manifest @@ -1,13 +1,13 @@ -MD5 35257236e110ef425e9bd1ad31ff58e1 ChangeLog 18561 -MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222 +MD5 0155ec5fe882194a529695f9af9e154b subversion-1.1.0.ebuild 9008 MD5 1b9acc042ae6c0b58071cf9ea8adc57a subversion-0.27.0.ebuild 7880 MD5 5cff2e6d2191553c86d931e5240ba23a subversion-0.32.1.ebuild 8136 +MD5 35257236e110ef425e9bd1ad31ff58e1 ChangeLog 18561 +MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222 MD5 4c7351dd78c5ddf1c3f49cb621d6efe9 subversion-1.0.8.ebuild 9721 -MD5 68dbe8d9c2e6c41e04864f0b1760c559 subversion-1.1.0.ebuild 8862 -MD5 4fd39b311d09602c93a9ff0aceaf8596 files/70svn-gentoo.el 136 MD5 e232822bee0a8ed00f6b9d7805b83307 files/digest-subversion-0.27.0 132 +MD5 257be4b439c371b285685b3be0e17568 files/digest-subversion-1.1.0 70 +MD5 062d550a01e930b20be035b5616cadbe files/subversion-1.1.0-build.patch 771 MD5 69cf99186dd88a6b26c6c121fc4c16a9 files/digest-subversion-0.32.1 132 +MD5 4fd39b311d09602c93a9ff0aceaf8596 files/70svn-gentoo.el 136 MD5 ce6f3698724b55cf49e647727207cca5 files/subversion-db4.patch 563 -MD5 062d550a01e930b20be035b5616cadbe files/subversion-1.1.0-build.patch 771 MD5 87d4c36172feaa28b4be6158906f3644 files/digest-subversion-1.0.8 70 -MD5 257be4b439c371b285685b3be0e17568 files/digest-subversion-1.1.0 70 diff --git a/dev-util/subversion/subversion-1.1.0.ebuild b/dev-util/subversion/subversion-1.1.0.ebuild index 25ec4ad8aaa8..1fe903c60208 100644 --- a/dev-util/subversion/subversion-1.1.0.ebuild +++ b/dev-util/subversion/subversion-1.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.1.0.ebuild,v 1.3 2004/10/08 12:06:12 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.1.0.ebuild,v 1.4 2004/10/09 17:47:35 pauldv Exp $ inherit elisp-common libtool python eutils @@ -11,7 +11,7 @@ HOMEPAGE="http://subversion.tigris.org/" SLOT="0" LICENSE="Apache-1.1" KEYWORDS="~x86 ~sparc ~ppc ~amd64 ~alpha ~hppa" -IUSE="ssl apache2 berkdb python emacs perl java" +IUSE="ssl apache2 berkdb python emacs perl java jikes" S=${WORKDIR}/${P/_rc/-rc} @@ -106,6 +106,11 @@ src_compile() { use python && myconf="${myconf} --with-python=/usr/bin/python" use python || myconf="${myconf} --without-python" + if use java; then + use jikes && myconf=${myconf} --with-jikes=yes + use jikes || myconf=${myconf} --without-jikes + fi + if use python || use perl; then myconf="${myconf} --with-swig" else @@ -140,6 +145,9 @@ src_compile() { make swig-pl || die "Perl library building failed" fi if use java; then + # ensure that the destination dir exists, else some compilation fails + mkdir -p ${S}/subversion/bindings/java/javahl/classes + #Compile javahl make JAVACFLAGS="-source 1.3 -encoding iso8859-1" javahl || die "Compilation failed" fi |