bump; re-based patch for new version

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

diff --git a/dev-python/pysvn/ChangeLog b/dev-python/pysvn/ChangeLog
index 51b36326b46e9f2ea6aff451dc5b222a2b0907ca..16a90d80e51ee87e92098700817fbaa3022bac42 100644 (file)
--- 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 <idella4@gentoo.org>
+  +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 <idella4@gentoo.org>
   -files/pysvn-1.7.6-respect_flags.patch,

diff --git a/dev-python/pysvn/Manifest b/dev-python/pysvn/Manifest
index c33896aabf4bf6bc70f2c4d6e05931a7cd06b3e0..1031ffa54db2778ea10f395d47874ded82a4ec29 100644 (file)
--- a/dev-python/pysvn/Manifest
+++ b/dev-python/pysvn/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX pysvn-1.7.10-respect_flags.patch 4292 SHA256 41b8649bacb8636f586b41166bef77edb535b425f0174e3ba6fbd90f85cfe7cf SHA512 d458ddd3e90572a0a6423da42cc57b2433f6df2167c804ef6c646094410a9666dc340bc6a13c9bfaeffe2aa46b7c87578ceef4a6ef6df33b35fc42430564a9ba WHIRLPOOL 627dfc3ba6d151f4711a48ef76d0ba3ba723a61a362301b60d744505d8a7681f6e3ac24df1537f7f8ccca05d5fbaeffa194483b0c32a59834a55c79890337509
 AUX pysvn-1.7.9-respect_flags.patch 4305 SHA256 e529ec3291ce96f5a9e032e4b7b5be9a8457464c2611fbb86e174b3a123556f7 SHA512 3ad2b18341c3d5b3ca9557b95045dae6719af7aadfd8626497ba45b0867e2c72de9b212d22adc9d642440726ab29d36e4bc4100677b8edacbcba83fa09aa5369 WHIRLPOOL aad7767be38be67f4125bbd149262e6cb1b5a56c2052a2564c4a6b55d0d04b4ccd596e27fde7e34cd8dbe70200f5a1362e2311359ce4a6a0b17805507b987697
+DIST pysvn-1.7.10.tar.gz 352631 SHA256 cb8a7eca9fd5d077f4b086c79cc1115a2f38a37979eee836ff258b4da0aee517 SHA512 3404ce53f974ff91a7eecea29176f6b71f1dbb37a716880dfd3d2961d4c6e0c81f87aa46308994d4f7ed6a6cbca7f7451753e1de43ce95fef4443fc5f70ff3aa WHIRLPOOL 99ac425ad2e19355521c73947cf33b2c5bff0023af686d699fdfcd7abc8c5f965974c9762b0dbd3ae3cddfc833e35ac549af1de54ca2472d1354a8fa126e8c36
 DIST pysvn-1.7.9.tar.gz 352320 SHA256 8a58ea6405e5f5ffd0850fc5ed6bc29a93b3573da099293f49ef3241e5be1692 SHA512 966f9b57f63abc68d82a0f0f0d710d3109c2bd515eb0b0dacdca140b0db32154c802d27b4f79062da19f0d18ff6332b729c6f9c06e0a74742161a00b74bef7aa WHIRLPOOL 53f27a30ce97b723fe0d1a8540221e25e593fc00789eab7b6e2814f3ffe3ff8f485523ad7fe3bff7c1b5d101fb87d694a1c18111d2523895835ea72ea1ee6aab
+EBUILD pysvn-1.7.10.ebuild 1511 SHA256 79727afd9f52b7e381e985e3c5a4ba17b6a752219a18e5867fb9d2f603e6a5a8 SHA512 b3dd8fc0668c8a8f0dfec4fd0517eae00d2733c912c7ab97edcbf183bdc262e365090992d3c4a391f793810805730c0c4d32756cc5e74c5d79b7bb911580e0ce WHIRLPOOL 16fd9fcab847ce11928f28ac8196c29fb1e8a90fb88def0a48990f4b172c52625e83bd5e2460cbb5893055d1e6aec9df277b89ae45b5397854fe9ea0f3963189
 EBUILD pysvn-1.7.9.ebuild 1510 SHA256 db76c9e648646f738ec41a62c7e9bfc76416e073951c07ecc876fd0ba364b9dd SHA512 c46f537feca6b04db34353024269a0816269466444fd783484b8a4446baec87956d73f7d9f756249b94ae2c7c7ac3a1d406dd804b125e4d2a4bcfdc4cf04cd35 WHIRLPOOL 5125235c8d7af3999cf73b2b9fe789a843a1c8a180822daceeb3dfffd8989f1e6a701e21a90a112881ba4af0496bb35050fdc5d3aeb6448b1fc7a676aae92af5
-MISC ChangeLog 6552 SHA256 b51cd66374c5fc62c66e3c8f75baa2d6d7c1a0cc9503ad855d6aff44eb445f96 SHA512 4324132896b81ee46238eab8fb7bb78b9aa4c285e2e2bf84621711ceb5367d8387116681df93b5e679b0e43da3819959d3789501d501b8e2c163bd3475baae20 WHIRLPOOL 6ce4bfe108bc737874aa15dd2eb56a7c3161b7a395023f6db23ecef39974c49fed503a920a2e405e56058a63307b16faaab5a2fbd92cdf544b23937dbd96c112
+MISC ChangeLog 6734 SHA256 0b3d4f1ab4103a8b4bc8ac887bc7d6d9b9cc2336b7099695bf5f8d770daf8d5d SHA512 1e8904102927f29ab190a8117cf66f0535de5f8f78e294bf61efd79c077ecbfb01f3ae28901472624adf3cb0af95e095967f4df032eeb411a54f745868e81fd4 WHIRLPOOL 93819d4fa0aa298d79b163a7ead473b34ac57db1b6f3ec1e3cc571056014ea887c8bb1a3198b00411da6500e289de489d91808c3f2e955f9170d5a17eb4d59b3
 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlS2AJoACgkQso7CE7gHKw1i/ACgolDAPcyESW8j1N9XQdDvsuSp
-cnQAni1zRuJaVNP5z8FCLo7uxtSd1oaY
-=e5Oo
+iEYEAREIAAYFAlUSkyMACgkQso7CE7gHKw2pCgCdGQE45f5yUF2r7klnoUWH8OgD
+BIAAn2z6PABAhjbLep2OxyCK3agsd6Pq
+=mDdq
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..18c7ea6
--- /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 (file)
index 0000000..a104f9d
--- /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}]
+       <dev-vcs/subversion-1.9"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-respect_flags.patch )
+
+python_prepare() {
+       # Don't use internal copy of dev-python/pycxx.
+       rm -r Import || die
+
+       # http://pysvn.tigris.org/source/browse/pysvn?view=rev&revision=1469
+       sed -e "s/PYSVN_HAS_SVN_CLIENT_CTX_T__CONFLICT_FUNC_16/PYSVN_HAS_SVN_CLIENT_CTX_T__CONFLICT_FUNC_1_6/" -i Source/pysvn_svnenv.hpp
+}
+
+python_configure() {
+       cd Source || die
+       # all config options from 1.7.6 are all already set
+       esetup.py configure
+}
+
+python_compile() {
+       cd Source || die
+       emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+}
+
+python_test() {
+       cd Tests || die
+       emake
+}
+
+python_install() {
+       cd Source || die
+       python_domodule pysvn
+}
+
+python_install_all() {
+       use doc && local HTML_DOCS=( Docs/ )
+       use examples && local EXAMPLES=( Examples/Client/. )
+       distutils-r1_python_install_all
+}