summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-03-03 11:59:20 +0000
committerMichał Górny <mgorny@gentoo.org>2013-03-03 11:59:20 +0000
commit7869592de097010cbea897b3e6db70e2d06736c4 (patch)
tree94707147d22d2e84a88c48e99379980ced12027d /dev-vcs
parentremove old (diff)
downloadgentoo-2-7869592de097010cbea897b3e6db70e2d06736c4.tar.gz
gentoo-2-7869592de097010cbea897b3e6db70e2d06736c4.tar.bz2
gentoo-2-7869592de097010cbea897b3e6db70e2d06736c4.zip
Unconditionally set proper Python version for build-time. Fixes bug #459708.
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)
Diffstat (limited to 'dev-vcs')
-rw-r--r--dev-vcs/subversion/ChangeLog5
-rw-r--r--dev-vcs/subversion/subversion-1.7.8.ebuild10
2 files changed, 8 insertions, 7 deletions
diff --git a/dev-vcs/subversion/ChangeLog b/dev-vcs/subversion/ChangeLog
index cf642ee9eb17..8267feaceb17 100644
--- a/dev-vcs/subversion/ChangeLog
+++ b/dev-vcs/subversion/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-vcs/subversion
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.100 2013/03/02 21:09:45 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.101 2013/03/03 11:59:20 mgorny Exp $
+
+ 03 Mar 2013; Michał Górny <mgorny@gentoo.org> subversion-1.7.8.ebuild:
+ Unconditionally set proper Python version for build-time. Fixes bug #459708.
02 Mar 2013; Markos Chandras <hwoarang@gentoo.org>
subversion-1.6.17-r7.ebuild, subversion-1.7.6.ebuild, subversion-1.7.7.ebuild,
diff --git a/dev-vcs/subversion/subversion-1.7.8.ebuild b/dev-vcs/subversion/subversion-1.7.8.ebuild
index d25d7e43498e..b04184f8ea68 100644
--- a/dev-vcs/subversion/subversion-1.7.8.ebuild
+++ b/dev-vcs/subversion/subversion-1.7.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.8.ebuild,v 1.4 2013/03/02 21:09:45 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.8.ebuild,v 1.5 2013/03/03 11:59:20 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python{2_5,2_6,2_7} )
@@ -86,11 +86,6 @@ pkg_setup() {
java-pkg-opt-2_pkg_setup
- if use ctypes-python || use python; then
- # for build-time scripts
- python_export_best
- fi
-
if ! use webdav-neon && ! use webdav-serf; then
ewarn "WebDAV support is disabled. You need WebDAV to"
ewarn "access repositories through the HTTP protocol."
@@ -188,6 +183,9 @@ src_configure() {
#check newer versions, if this is still/again needed
myconf+=" --disable-disallowing-of-undefined-references"
+ # for build-time scripts
+ python_export_best
+
#force ruby-1.8 for bug 399105
#allow overriding Python include directory
ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby18 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc18 \