diff options
| author |   Paul de Vrieze <pauldv@gentoo.org> | 2005-10-24 14:35:26 +0000 |
|---|---|---|
| committer | Paul de Vrieze <pauldv@gentoo.org> | 2005-10-24 14:35:26 +0000 |
| commit | 680e425699119959f09fa7196d8fafbbf0110ab2 (patch) | |
| tree | 6890ef00e5421d9566d8954346899d92aec61afa /dev-util/subversion | |
| parent | Marking amavisd-new-2.3.3-r1 stable per bug 110289 (diff) | |
| download | gentoo-2-680e425699119959f09fa7196d8fafbbf0110ab2.tar.gz gentoo-2-680e425699119959f09fa7196d8fafbbf0110ab2.tar.bz2 gentoo-2-680e425699119959f09fa7196d8fafbbf0110ab2.zip | |
Fix the runtime dependency on the jdk to only be a jre dependency.
(Portage version: 2.0.53_rc5)
Diffstat (limited to 'dev-util/subversion')
| -rw-r--r-- | dev-util/subversion/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/subversion/subversion-1.2.3-r3.ebuild | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog index 55481d608def..9b117fc3b359 100644 --- a/dev-util/subversion/ChangeLog +++ b/dev-util/subversion/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/subversion # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.190 2005/10/24 10:04:44 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.191 2005/10/24 14:35:26 pauldv Exp $ + + 24 Oct 2005; <pauldv@gentoo.org> subversion-1.2.3-r3.ebuild: + Fix the runtime dependency on the jdk to only be a jre dependency. Bug + #110322 21 Oct 2005; <pauldv@gentoo.org> subversion-1.2.3-r3.ebuild: Add support for ruby bindings. Courtessy of Tom Payne <twp@gentoo.org> diff --git a/dev-util/subversion/subversion-1.2.3-r3.ebuild b/dev-util/subversion/subversion-1.2.3-r3.ebuild index ac9a96d2d642..7f0942e9e056 100644 --- a/dev-util/subversion/subversion-1.2.3-r3.ebuild +++ b/dev-util/subversion/subversion-1.2.3-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.2.3-r3.ebuild,v 1.2 2005/10/24 10:04:44 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.2.3-r3.ebuild,v 1.3 2005/10/24 14:35:26 pauldv Exp $ inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache perl-module @@ -15,7 +15,7 @@ IUSE="apache2 berkdb python emacs perl java nls nowebdav zlib ruby" RESTRICT="test" # Presently subversion doesn't build with swig-1.3.22, bug 65424 -RDEPEND="apache2? ( ${APACHE2_DEPEND} ) +COMMONDEPEND="apache2? ( ${APACHE2_DEPEND} ) >=dev-libs/apr-util-0.9.5 python? ( >=dev-lang/swig-1.3.21 >=dev-lang/python-2.0 ) perl? ( >=dev-lang/swig-1.3.21 @@ -28,7 +28,11 @@ RDEPEND="apache2? ( ${APACHE2_DEPEND} ) zlib? ( sys-libs/zlib ) java? ( virtual/jdk ) emacs? ( virtual/emacs )" -DEPEND="${RDEPEND} +RDEPEND="${COMMONDEPEND} + java? ( virtual/jre )" + +DEPEND="${COMMONDEPEND} + java? ( virtual/jdk ) >=sys-devel/autoconf-2.59" # Does not work because jikes is broken # jikes? (dev-java/jikes)" |