From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- dev-python/pysvn/Manifest | 5 +- .../pysvn/files/pysvn-1.9.11-respect-flags.patch | 124 +++++++++++++++++++++ dev-python/pysvn/pysvn-1.8.0.ebuild | 7 +- dev-python/pysvn/pysvn-1.9.11.ebuild | 64 +++++++++++ 4 files changed, 198 insertions(+), 2 deletions(-) create mode 100644 dev-python/pysvn/files/pysvn-1.9.11-respect-flags.patch create mode 100644 dev-python/pysvn/pysvn-1.9.11.ebuild (limited to 'dev-python/pysvn') diff --git a/dev-python/pysvn/Manifest b/dev-python/pysvn/Manifest index 363d7bf4ae0a..215cd140f3ed 100644 --- a/dev-python/pysvn/Manifest +++ b/dev-python/pysvn/Manifest @@ -1,4 +1,7 @@ AUX pysvn-1.8.0-respect_flags.patch 4633 BLAKE2B 5063e9491623033155fd59f97ef794ae1fd8205b0588b369395b5e021d40646fd8e65387bd27b5daa95d43f1f573059e88de5cf266b76b98d3d85834039e8ea6 SHA512 e573b995e45f7129b0e52e702ce1793180b7b2c3ef3ccebc8f1b16af9454beeca581f2486eae519437f41cd195c0dc6535c51e9dcef1258dffa57f5a99c4600b +AUX pysvn-1.9.11-respect-flags.patch 5627 BLAKE2B 6a3b4b26581ed05251380eb13b6e771824417ab51b2b7c4f1a8659ce99b727f5c6b6295142c88a8c7ce6a78eb21c3c697ab392e529bd63d04a12bce431768923 SHA512 22e34ed59ad6f3c0ee253e03e5b86e76a9cd4453e27e5aacdc82090b17b7bfaa5f38fb314b75a824b3fe72a7641fac5704255ee98e582a55ff959771ed4d4f03 DIST pysvn-1.8.0.tar.gz 366583 BLAKE2B b7aae274bd2387901df4075ffa70d73e4462a127aa6690aecc406288a9e8dc2f31599297480cfc5fef14ef39c47daa3c309b6c61f49d781abb4d8c0f9a9fcb12 SHA512 14a70b910be986eba638a903edde5046c93314fedb08a7c15d464dc51da1c7efeb87147cc68c00ff9ac1b4ca506d099d3aedf7e4d86f92642c7304ef9540653b -EBUILD pysvn-1.8.0.ebuild 1241 BLAKE2B ec1f256c72bbcab0bba08b23d6c726d1fb5511946f33150322a979bbee46311e4c7ebda7bb7e1504bbc1e4e041d7c5a1700aae729062d64eb355368539914cfa SHA512 b7d7883bac60e5a3985fa522420e151539cf8d7b827534300d0c33def0eae775a125d56bf0c89c11898b0aa0363125405c9905af03f2a8df562d71d9494eaab0 +DIST pysvn-1.9.11.tar.gz 624408 BLAKE2B 2ca13388717cc82b68509843e3b1780bceb5c088c41fadc81206c909eb185ec7c73d0a7453fc4e0c1a78a5186e21d382c79af0fb666edce7f5e72c0cf63e25db SHA512 078dc0e19a1f29d40571de002734943415594bcbe132a4d0e6bf8e8781175345ca1b3a4967a183a15efb1462871a40d8e3879a22c913a649555ca593fb99db89 +EBUILD pysvn-1.8.0.ebuild 1309 BLAKE2B 4cc934dc07ff1bb7084421eee64e5febd9ed99bbd790a9b1d29029b4d921058e54f453fa2ecc538c52bc3e921762b37aa9f7a82878a7d46edb1597d994e36616 SHA512 114212ff03e8e78a8a08a6cf0636daa5c2f198a74353947f3a9ae237e61fd943ac5f54e5d452088237f4ed61352a63e139086a280688130b90a9f9114f5bccc6 +EBUILD pysvn-1.9.11.ebuild 1335 BLAKE2B 16688415e6423b1dbc22da7ecfd2561d716d28c7180a630f1384e921aa6760e5dd2d15c08693f39cf8ff9f59e6125789eae599d1ff52b0114edb118b315d99a3 SHA512 c2283d38a538d8ba24c4038012a7afc10a9b239ce185fe1dbae892cf26d4f331c4caa40c47299f55d86b6856c30c8d0a84fd1a4f4bbb80f222267c4ddd19e2ec MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/dev-python/pysvn/files/pysvn-1.9.11-respect-flags.patch b/dev-python/pysvn/files/pysvn-1.9.11-respect-flags.patch new file mode 100644 index 000000000000..9a9bcd7f44ec --- /dev/null +++ b/dev-python/pysvn/files/pysvn-1.9.11-respect-flags.patch @@ -0,0 +1,124 @@ +From 73655a682b69fd514f7060eb67e60ecb617c5f27 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping +Date: Sun, 1 Mar 2020 14:16:13 +0100 +Subject: [PATCH] Respect CC, CXX, LDFLAGS + +--- + Patches/test_proplist.mak | 4 ++-- + Source/setup_configure.py | 24 ++++++++++-------------- + 2 files changed, 12 insertions(+), 16 deletions(-) + +diff --git a/Patches/test_proplist.mak b/Patches/test_proplist.mak +index 9d9a58a..02e7a68 100644 +--- a/Patches/test_proplist.mak ++++ b/Patches/test_proplist.mak +@@ -2,7 +2,7 @@ CCCFLAGS=-fPIC -fexceptions -frtti -I$(SVN_INC) -I$(APR_INC) + LDLIBS=-L$(SVN_LIB) -lsvn_client-1 -lapr-0 + + test_proplist: test_proplist.o +- g++ -g -o test_proplist test_proplist.o $(LDLIBS) ++ $(CXX) $(LDFLAGS) -o test_proplist test_proplist.o $(LDLIBS) + + test_proplist.o: test_proplist.cpp +- g++ -c -g $(CCCFLAGS) -o $@ $< ++ $(CXX) -c $(LDFLAGS) $(CCCFLAGS) -o $@ $< +diff --git a/Source/setup_configure.py b/Source/setup_configure.py +index e02a6a5..bbe7ec7 100644 +--- a/Source/setup_configure.py ++++ b/Source/setup_configure.py +@@ -900,8 +900,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' +@@ -1037,8 +1037,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' % min_pycxx_version, +@@ -1104,11 +1104,10 @@ class MacOsxCompilerGCC(CompilerGCC): + + def setupUtilities( self ): + self._addVar( 'CCCFLAGS', +- '-g ' + '-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', '%(CCC)s $(LDFLAGS)' ) + + def setupPySvn( self ): + # Support building in a virtualenv. +@@ -1132,7 +1131,6 @@ class MacOsxCompilerGCC(CompilerGCC): + self._addVar( 'PYTHON_INC', distutils.sysconfig.get_python_inc() ) + + py_cflags_list = [ +- '-g', + '-Wall -fPIC', + '-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', +@@ -1166,7 +1164,7 @@ class MacOsxCompilerGCC(CompilerGCC): + + if self.options.hasOption( '--link-python-framework-via-dynamic-lookup' ): + # preferred link method on homebrew for pysvn +- self._addVar( 'LDSHARED', '%(CCC)s -bundle -g ' ++ self._addVar( 'LDSHARED', '%(CCC)s -bundle $(LDFLAGS) ' + '-framework System ' + '-framework CoreFoundation ' + '-framework Kerberos ' +@@ -1174,7 +1172,7 @@ class MacOsxCompilerGCC(CompilerGCC): + '-undefined dynamic_lookup ' + '%(LDLIBS)s' ) + else: +- self._addVar( 'LDSHARED', '%(CCC)s -bundle -g ' ++ self._addVar( 'LDSHARED', '%(CCC)s -bundle $(LDFLAGS) ' + '-framework System ' + '%(PYTHON_FRAMEWORK)s ' + '-framework CoreFoundation ' +@@ -1247,11 +1245,10 @@ class UnixCompilerGCC(CompilerGCC): + + def setupUtilities( self ): + self._addVar( 'CCCFLAGS', +- '-g ' + '-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', '%(CCC)s $(LDFLAGS)' ) + + def setupPySvn( self ): + self._pysvnModuleSetup() +@@ -1279,8 +1276,7 @@ class UnixCompilerGCC(CompilerGCC): + py_cflags_list.extend( self._getDefines( '-D%s' ) ) + + if self.options.hasOption( '--enable-debug' ): +- print( 'Info: Debug enabled' ) +- py_cflags_list.append( '-g' ) ++ print( 'Info: --enable-debug ignored' ) + + if self.options.hasOption( '--disable-deprecated-functions-warnings' ): + print( 'Info: Disable deprecated functions warnings' ) +@@ -1289,7 +1285,7 @@ class UnixCompilerGCC(CompilerGCC): + self._addVar( 'CCFLAGS', ' '.join( py_cflags_list ) ) + self._addVar( 'CCCFLAGS', ' '.join( py_cflags_list+['-fexceptions -frtti'] ) ) + self._addVar( 'LDLIBS', ' '.join( self._getLdLibs() ) ) +- self._addVar( 'LDSHARED', '%(CCC)s -shared -g' ) ++ self._addVar( 'LDSHARED', '%(CCC)s -shared $(LDFLAGS)' ) + + #-------------------------------------------------------------------------------- + class LinuxCompilerGCC(UnixCompilerGCC): +-- +2.24.1 + diff --git a/dev-python/pysvn/pysvn-1.8.0.ebuild b/dev-python/pysvn/pysvn-1.8.0.ebuild index e5d65aa19fa9..f64c4e01c59c 100644 --- a/dev-python/pysvn/pysvn-1.8.0.ebuild +++ b/dev-python/pysvn/pysvn-1.8.0.ebuild @@ -54,6 +54,11 @@ python_install() { python_install_all() { use doc && local HTML_DOCS=( Docs/. ) - use examples && local EXAMPLES=( Examples/Client/. ) + if use examples; then + docinto examples + dodoc -r Examples/Client/. + docompress -x /usr/share/doc/${PF}/examples + fi + distutils-r1_python_install_all } diff --git a/dev-python/pysvn/pysvn-1.9.11.ebuild b/dev-python/pysvn/pysvn-1.9.11.ebuild new file mode 100644 index 000000000000..1f1576d73835 --- /dev/null +++ b/dev-python/pysvn/pysvn-1.9.11.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit eutils distutils-r1 toolchain-funcs + +DESCRIPTION="Object-oriented python bindings for subversion" +HOMEPAGE="https://pysvn.sourceforge.io/" +SRC_URI="mirror://sourceforge/project/pysvn/pysvn/V${PV}/${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-7.0.2[${PYTHON_USEDEP}] + >=dev-vcs/subversion-1.9" +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 +} -- cgit v1.2.3