mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-python/pysvn: Remove redundant versions
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny
@@ -1,2 +1 @@
|
||||
DIST pysvn-1.8.0.tar.gz 366583 BLAKE2B b7aae274bd2387901df4075ffa70d73e4462a127aa6690aecc406288a9e8dc2f31599297480cfc5fef14ef39c47daa3c309b6c61f49d781abb4d8c0f9a9fcb12 SHA512 14a70b910be986eba638a903edde5046c93314fedb08a7c15d464dc51da1c7efeb87147cc68c00ff9ac1b4ca506d099d3aedf7e4d86f92642c7304ef9540653b
|
||||
DIST pysvn-1.9.11.tar.gz 624408 BLAKE2B 2ca13388717cc82b68509843e3b1780bceb5c088c41fadc81206c909eb185ec7c73d0a7453fc4e0c1a78a5186e21d382c79af0fb666edce7f5e72c0cf63e25db SHA512 078dc0e19a1f29d40571de002734943415594bcbe132a4d0e6bf8e8781175345ca1b3a4967a183a15efb1462871a40d8e3879a22c913a649555ca593fb99db89
|
||||
|
||||
@@ -1,99 +0,0 @@
|
||||
Source/setup_configure.py | 26 +++++++++++++-------------
|
||||
1 file changed, 13 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/Source/setup_configure.py b/Source/setup_configure.py
|
||||
index afeee2d..47f2717 100644
|
||||
--- a/Source/setup_configure.py
|
||||
+++ b/Source/setup_configure.py
|
||||
@@ -849,8 +849,8 @@ class CompilerGCC(Compiler):
|
||||
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'
|
||||
@@ -976,8 +976,8 @@ class MacOsxCompilerGCC(CompilerGCC):
|
||||
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,
|
||||
@@ -1032,11 +1032,11 @@ class MacOsxCompilerGCC(CompilerGCC):
|
||||
|
||||
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()
|
||||
@@ -1048,7 +1048,7 @@ class MacOsxCompilerGCC(CompilerGCC):
|
||||
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',
|
||||
@@ -1074,13 +1074,12 @@ class MacOsxCompilerGCC(CompilerGCC):
|
||||
|
||||
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 ):
|
||||
@@ -1140,11 +1139,11 @@ class UnixCompilerGCC(CompilerGCC):
|
||||
|
||||
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()
|
||||
@@ -1155,6 +1154,7 @@ class UnixCompilerGCC(CompilerGCC):
|
||||
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',
|
||||
@@ -1176,7 +1176,7 @@ class UnixCompilerGCC(CompilerGCC):
|
||||
|
||||
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):
|
||||
@@ -1,64 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
PYTHON_COMPAT=( python3_6 )
|
||||
|
||||
inherit eutils 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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
|
||||
IUSE="doc examples"
|
||||
|
||||
DEPEND="
|
||||
>=dev-python/pycxx-6.2.6[${PYTHON_USEDEP}]
|
||||
dev-vcs/subversion"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${P}-respect_flags.patch )
|
||||
|
||||
DISTUTILS_IN_SOURCE_BUILD=true
|
||||
|
||||
python_prepare_all() {
|
||||
# Don't use internal copy of dev-python/pycxx.
|
||||
rm -r Import || die
|
||||
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
|
||||
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/. )
|
||||
if use examples; then
|
||||
docinto examples
|
||||
dodoc -r Examples/Client/.
|
||||
docompress -x /usr/share/doc/${PF}/examples
|
||||
fi
|
||||
|
||||
distutils-r1_python_install_all
|
||||
}
|
||||
Reference in New Issue
Block a user