[gentoo-commits] gentoo-x86 commit in dev-vcs/subversion: subversion-1.8.5.ebuild ChangeLog

["Fabian Groffen (grobian)" <grobian@gentoo.org>]

grobian     14/01/22 19:47:03

  Modified:             subversion-1.8.5.ebuild ChangeLog
  Log:
  Finally fix compilation of swig-python module on Darwin
  
  (Portage version: 2.2.8-prefix/cvs/Darwin i386, signed Manifest commit with key 0x5F75F607C5C74E89)

Revision  Changes    Path
1.5                  dev-vcs/subversion/subversion-1.8.5.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/subversion-1.8.5.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/subversion-1.8.5.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/subversion-1.8.5.ebuild?r1=1.4&r2=1.5

Index: subversion-1.8.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.5.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- subversion-1.8.5.ebuild	16 Jan 2014 19:30:06 -0000	1.4
+++ subversion-1.8.5.ebuild	22 Jan 2014 19:47:03 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.5.ebuild,v 1.4 2014/01/16 19:30:06 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.5.ebuild,v 1.5 2014/01/22 19:47:03 grobian Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -128,23 +128,6 @@
 	sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
 		die "/bin/sh is not POSIX shell!"
 
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# replace provided script that tries too hard to do a framework
-		# build, ending up with host-provided Python
-		cat > build/get-py-info.py << EOS
-import sys
-import sysconfig
-if '--compile' in sys.argv:
-	print('${CHOST}-gcc')
-
-if '--libs' in sys.argv or '--link' in sys.argv:
-	libs = sysconfig.get_config_var('LIBS').split() + sysconfig.get_config_var('SYSLIBS').split()
-	libs.append('-lpython' + sysconfig.get_config_var('VERSION'))
-	print(' '.join(libs))
-EOS
-		fperms +x build/get-py-info.py
-	fi
-
 	eautoconf
 	elibtoolize
 
@@ -152,6 +135,13 @@
 		-i build-outputs.mk || die "sed failed"
 
 	if use python; then
+		if [[ ${CHOST} == *-darwin* ]] ; then
+			# http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C20130614113003.GA19257@tarsus.local2%3E
+			# in short, we don't have gnome-keyring stuff here, patch
+			# borrowed from MacPorts
+			epatch "${FILESDIR}"/${P}-swig-python-no-gnome-keyring.patch
+		fi
+
 		# XXX: make python_copy_sources accept path
 		S=${S}/subversion/bindings/swig/python python_copy_sources
 		rm -r "${S}"/subversion/bindings/swig/python || die
@@ -208,6 +198,12 @@
 		python_export_best
 	fi
 
+	if use python && [[ ${CHOST} == *-darwin* ]] ; then
+		export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
+		export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
+		export ac_cv_python_compile="$(tc-getCC)"
+	fi
+
 	#force ruby-1.8 for bug 399105
 	#allow overriding Python include directory
 	ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby19 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc19 \



1.162                dev-vcs/subversion/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/ChangeLog?rev=1.162&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/ChangeLog?rev=1.162&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/ChangeLog?r1=1.161&r2=1.162

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- ChangeLog	18 Jan 2014 09:29:07 -0000	1.161
+++ ChangeLog	22 Jan 2014 19:47:03 -0000	1.162
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/subversion
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.161 2014/01/18 09:29:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.162 2014/01/22 19:47:03 grobian Exp $
+
+  22 Jan 2014; Fabian Groffen <grobian@gentoo.org>
+  +files/subversion-1.8.5-swig-python-no-gnome-keyring.patch,
+  subversion-1.8.5.ebuild:
+  Finally fix compilation of swig-python module on Darwin
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org> subversion-1.7.14.ebuild:
   Mark s390/sh stable.