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 | 8a9835ef00ab93fe5cb6bd8e2f9852900adbde16 (patch) | |
| tree | b8deebc616bec31cfc70d6becd40bf2c9a4fd127 /dev-util/subversion | |
| parent | 2.2.1 stable on x86. Removing 2.2. (diff) | |
| download | historical-8a9835ef00ab93fe5cb6bd8e2f9852900adbde16.tar.gz historical-8a9835ef00ab93fe5cb6bd8e2f9852900adbde16.tar.bz2 historical-8a9835ef00ab93fe5cb6bd8e2f9852900adbde16.zip | |
Fix the runtime dependency on the jdk to only be a jre dependency.
Package-Manager: portage-2.0.53_rc5
Diffstat (limited to 'dev-util/subversion')
| -rw-r--r-- | dev-util/subversion/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/subversion/Manifest | 4 | ||||
| -rw-r--r-- | dev-util/subversion/subversion-1.2.3-r3.ebuild | 10 |
3 files changed, 14 insertions, 6 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/Manifest b/dev-util/subversion/Manifest index f608710e3a67..6c5d0985b668 100644 --- a/dev-util/subversion/Manifest +++ b/dev-util/subversion/Manifest @@ -1,4 +1,4 @@ -MD5 b4fea785094fff779d72e0dc3185da9f ChangeLog 32296 +MD5 cb132048be698b22148746a31a9cb099 ChangeLog 32444 MD5 4fd39b311d09602c93a9ff0aceaf8596 files/70svn-gentoo.el 136 MD5 1c207179f5bf0b148528312cbc37632d files/digest-subversion-1.1.3 70 MD5 4cdbf1f8636cd0a207ae87228b6f412b files/digest-subversion-1.2.3 70 @@ -17,5 +17,5 @@ MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222 MD5 f01c7eaf4fdafaa346051868f66c0148 subversion-1.1.3.ebuild 11430 MD5 873d9543dfdaea49b33f4934cf1f54b9 subversion-1.2.3-r1.ebuild 10875 MD5 ca08bcb93390917e84341cea8a590ac9 subversion-1.2.3-r2.ebuild 10907 -MD5 acb12c13032b119196f65207b6b1db98 subversion-1.2.3-r3.ebuild 11672 +MD5 151d0534301dc7eb23755355343fcd04 subversion-1.2.3-r3.ebuild 11755 MD5 82dabd375ad894884925f0c7c40fcbe3 subversion-1.2.3.ebuild 11793 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)" |