From 6e6eeeec4ac3ed05954591b9a997287c8e6d9116 Mon Sep 17 00:00:00 2001 From: Ian Delaney Date: Wed, 25 Mar 2015 10:50:56 +0000 Subject: bump; re-based patch for new version (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D) --- dev-python/pysvn/ChangeLog | 8 +- .../pysvn/files/pysvn-1.7.10-respect_flags.patch | 95 ++++++++++++++++++++++ dev-python/pysvn/pysvn-1.7.10.ebuild | 59 ++++++++++++++ 3 files changed, 161 insertions(+), 1 deletion(-) create mode 100644 dev-python/pysvn/files/pysvn-1.7.10-respect_flags.patch create mode 100644 dev-python/pysvn/pysvn-1.7.10.ebuild (limited to 'dev-python/pysvn') diff --git a/dev-python/pysvn/ChangeLog b/dev-python/pysvn/ChangeLog index 51b36326b46e..16a90d80e51e 100644 --- a/dev-python/pysvn/ChangeLog +++ b/dev-python/pysvn/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-python/pysvn # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pysvn/ChangeLog,v 1.45 2015/01/14 05:37:16 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pysvn/ChangeLog,v 1.46 2015/03/25 10:50:56 idella4 Exp $ + +*pysvn-1.7.10 (25 Mar 2015) + + 25 Mar 2015; Ian Delaney + +files/pysvn-1.7.10-respect_flags.patch, +pysvn-1.7.10.ebuild: + bump; re-based patch for new version 14 Jan 2015; Ian Delaney -files/pysvn-1.7.6-respect_flags.patch, diff --git a/dev-python/pysvn/files/pysvn-1.7.10-respect_flags.patch b/dev-python/pysvn/files/pysvn-1.7.10-respect_flags.patch new file mode 100644 index 000000000000..18c7ea630dcf --- /dev/null +++ b/dev-python/pysvn/files/pysvn-1.7.10-respect_flags.patch @@ -0,0 +1,95 @@ +diff -ur pysvn-1.7.9.orig/Source/setup_configure.py pysvn-1.7.9/Source/setup_configure.py +--- Source/setup_configure.py 2014-02-02 22:19:59.000000000 +0800 ++++ Source/setup_configure.py 2014-08-15 08:15:44.676746371 +0800 +@@ -848,8 +848,8 @@ + def __init__( self, setup ): + Compiler.__init__( self, setup ) + +- self._addVar( 'CCC', 'g++' ) +- self._addVar( 'CC', 'gcc' ) ++ self._addVar( 'CCC', '$(CXX)' ) ++ self._addVar( 'CC', '$(CC)' ) + + def getPythonExtensionFileExt( self ): + return '.so' +@@ -975,8 +975,8 @@ + else: + arch_options = '' + +- self._addVar( 'CCC', 'g++ %s' % (arch_options,) ) +- self._addVar( 'CC', 'gcc %s' % (arch_options,) ) ++ self._addVar( 'CCC', '$(CXX) %s' % (arch_options,) ) ++ self._addVar( 'CC', '$(CC) %s' % (arch_options,) ) + + self._find_paths_pycxx_dir = [ + '../Import/pycxx-%d.%d.%d' % pycxx_version, +@@ -1031,11 +1031,11 @@ + + def setupUtilities( self ): + self._addVar( 'CCCFLAGS', +- '-g ' ++ '$(CXXFLAGS) ' + '-Wall -fPIC -fexceptions -frtti ' + '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s ' + '-D%(DEBUG)s' ) +- self._addVar( 'LDEXE', '%(CCC)s -g' ) ++ self._addVar( 'LDEXE', '$(CXX) $(LDFLAGS)' ) + + def setupPySvn( self ): + self._pysvnModuleSetup() +@@ -1047,7 +1047,7 @@ + self._addVar( 'PYTHON_INC', distutils.sysconfig.get_python_inc() ) + + py_cflags_list = [ +- '-g', ++ '$(CXXFLAGS) ', + '-Wall -fPIC -fexceptions -frtti', + '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s', + '-DPYCXX_PYTHON_2TO3 -I%(PYCXX)s -I%(PYCXX_SRC)s -I%(PYTHON_INC)s', +@@ -1073,13 +1073,12 @@ + + self._addVar( 'CCCFLAGS', ' '.join( py_cflags_list ) ) + self._addVar( 'LDLIBS', ' '.join( py_ld_libs ) ) +- self._addVar( 'LDSHARED', '%(CCC)s -bundle -g ' ++ self._addVar( 'LDSHARED', '$(CXX) $(LDFLAGS) -bundle ' + '-framework System ' + '%(PYTHON_FRAMEWORK)s ' + '-framework CoreFoundation ' + '-framework Kerberos ' +- '-framework Security ' +- '%(LDLIBS)s' ) ++ '-framework Security' ) + + class UnixCompilerGCC(CompilerGCC): + def __init__( self, setup ): +@@ -1139,11 +1138,11 @@ + + def setupUtilities( self ): + self._addVar( 'CCCFLAGS', +- '-g ' ++ '$(CXXFLAGS) ' + '-Wall -fPIC -fexceptions -frtti ' + '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s ' + '-D%(DEBUG)s' ) +- self._addVar( 'LDEXE', '%(CCC)s -g' ) ++ self._addVar( 'LDEXE', '$(CXX) $(LDFLAGS)' ) + + def setupPySvn( self ): + self._pysvnModuleSetup() +@@ -1154,6 +1153,7 @@ + self._addVar( 'PYTHON_ARCH_SPECIFIC_INC', distutils.sysconfig.get_python_inc( True ) ) + + py_cflags_list = [ ++ '$(CXXFLAGS)', + '-Wall -fPIC -fexceptions -frtti', + '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s', + '-DPYCXX_PYTHON_2TO3 -I%(PYCXX)s -I%(PYCXX_SRC)s -I%(PYTHON_INC)s', +@@ -1171,7 +1171,7 @@ + + self._addVar( 'CCCFLAGS', ' '.join( py_cflags_list ) ) + self._addVar( 'LDLIBS', ' '.join( self._getLdLibs() ) ) +- self._addVar( 'LDSHARED', '%(CCC)s -shared -g' ) ++ self._addVar( 'LDSHARED', '$(CXX) $(LDFLAGS) -shared' ) + + #-------------------------------------------------------------------------------- + class LinuxCompilerGCC(UnixCompilerGCC): diff --git a/dev-python/pysvn/pysvn-1.7.10.ebuild b/dev-python/pysvn/pysvn-1.7.10.ebuild new file mode 100644 index 000000000000..a104f9deb862 --- /dev/null +++ b/dev-python/pysvn/pysvn-1.7.10.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pysvn/pysvn-1.7.10.ebuild,v 1.1 2015/03/25 10:50:56 idella4 Exp $ + +EAPI=5 +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +inherit distutils-r1 toolchain-funcs + +DESCRIPTION="Object-oriented python bindings for subversion" +HOMEPAGE="http://pysvn.tigris.org/" +SRC_URI="http://pysvn.barrys-emacs.org/source_kits/${P}.tar.gz" + +LICENSE="Apache-1.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" +IUSE="doc examples" + +DEPEND=" + >=dev-python/pycxx-6.2.0[${PYTHON_USEDEP}] +