diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2015-05-12 07:54:21 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2015-05-12 07:54:21 +0000 |
| commit | 1771012a6cee3aaaf408d66924d49e1225062397 (patch) | |
| tree | 74c163c87334efdc0bb5824416f31e9f71983025 /dev-vcs | |
| parent | Drop old (diff) | |
| download | gentoo-2-1771012a6cee3aaaf408d66924d49e1225062397.tar.gz gentoo-2-1771012a6cee3aaaf408d66924d49e1225062397.tar.bz2 gentoo-2-1771012a6cee3aaaf408d66924d49e1225062397.zip | |
Fixed configure run with USE="-ruby"
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'dev-vcs')
| -rw-r--r-- | dev-vcs/subversion/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-vcs/subversion/subversion-1.8.13.ebuild | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/dev-vcs/subversion/ChangeLog b/dev-vcs/subversion/ChangeLog index b0aa64700f6f..9dfc7556995b 100644 --- a/dev-vcs/subversion/ChangeLog +++ b/dev-vcs/subversion/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-vcs/subversion # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.226 2015/04/23 11:51:48 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.227 2015/05/12 07:54:21 polynomial-c Exp $ + + 12 May 2015; Lars Wendler <polynomial-c@gentoo.org> subversion-1.8.13.ebuild: + Fixed configure run with USE="-ruby". *subversion-1.7.20 (23 Apr 2015) diff --git a/dev-vcs/subversion/subversion-1.8.13.ebuild b/dev-vcs/subversion/subversion-1.8.13.ebuild index eace8e5bc4cd..5efee24b5b10 100644 --- a/dev-vcs/subversion/subversion-1.8.13.ebuild +++ b/dev-vcs/subversion/subversion-1.8.13.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.13.ebuild,v 1.3 2015/04/15 11:19:20 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.13.ebuild,v 1.4 2015/05/12 07:54:21 polynomial-c Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) @@ -208,7 +208,8 @@ src_configure() { # force ruby-2.1 # allow overriding Python include directory - ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby21 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc21 \ + ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby21" "none") \ + ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc21" "none") \ ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \ econf --libdir="${EPREFIX}/usr/$(get_libdir)" \ $(use_with apache2 apache-libexecdir) \ |