diff options
author | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-10-16 19:23:48 +0000 |
---|---|---|
committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-10-16 19:23:48 +0000 |
commit | 6b7f46de23cd4522dfd934d258232ddfbc56d783 (patch) | |
tree | 99e75a4408402ac2575b554d32b47cfb8e2d2490 /dev-python/pysvn | |
parent | Respect LDFLAGS. Bug #334643 (diff) | |
download | historical-6b7f46de23cd4522dfd934d258232ddfbc56d783.tar.gz historical-6b7f46de23cd4522dfd934d258232ddfbc56d783.tar.bz2 historical-6b7f46de23cd4522dfd934d258232ddfbc56d783.zip |
Delete older ebuild.
Diffstat (limited to 'dev-python/pysvn')
-rw-r--r-- | dev-python/pysvn/files/pysvn-1.7.0-darwin-freebsd.patch | 80 | ||||
-rw-r--r-- | dev-python/pysvn/pysvn-1.7.2.ebuild | 105 |
2 files changed, 0 insertions, 185 deletions
diff --git a/dev-python/pysvn/files/pysvn-1.7.0-darwin-freebsd.patch b/dev-python/pysvn/files/pysvn-1.7.0-darwin-freebsd.patch deleted file mode 100644 index a2ec45ff3ae8..000000000000 --- a/dev-python/pysvn/files/pysvn-1.7.0-darwin-freebsd.patch +++ /dev/null @@ -1,80 +0,0 @@ -FreeBSD: -http://bugs.gentoo.org/show_bug.cgi?id=287608 -Darwin: -build bundles, don't do Fink or MacPorts detection, don't use deprecated --Wno-long-long-double, don't inject some broken framework path - ---- Source/setup_configure.py -+++ Source/setup_configure.py -@@ -177,6 +177,8 @@ - module_type = '.so' - if self.platform == 'cygwin': - module_type = '.dll' -+ if self.is_mac_os_x: -+ module_type = '.bundle' - - if '--fixed-module-name' in argv: - print( 'Info: Using fixed module name' ) -@@ -249,21 +249,15 @@ - - # 10.4 needs the libintl.a but 10.3 does not - template_values['extra_libs'] = '%(svn_lib_dir)s/libintl.a' % template_values -- template_values['frameworks'] = '-framework System %s -framework CoreFoundation -framework Kerberos -framework Security' % framework_lib -+ template_values['frameworks'] = '-framework System -framework CoreFoundation -framework Kerberos -framework Security -lpython' - else: - if self.verbose: - print( 'Info: Using Mac OS X 10.3 makefile template' ) - - template_values['extra_libs'] = '' -- template_values['frameworks'] = '-framework System %s -framework CoreFoundation' % framework_lib -+ template_values['frameworks'] = '-framework System -framework CoreFoundation -lpython' - -- if self.is_mac_os_x_fink: -- makefile.write( self.makefile_template_macosx_fink % template_values ) -- -- elif self.is_mac_os_x_darwin_ports: -- makefile.write( self.makefile_template_macosx_darwin_ports % template_values ) -- -- elif self.mac_os_x_universal: -+ if self.mac_os_x_universal: - template_values[ 'mac_os_x_sdk' ] = self.mac_os_x_sdk - if sys.version_info[0] >= 3: - makefile.write( self.makefile_template_macosx_universal_py3 % template_values ) -@@ -447,11 +429,11 @@ - PYCXX=%(pycxx_dir)s - PYCXXSRC=%(pycxx_src_dir)s - LDSHARED=g++ -shared %(debug_cflags)s --LDLIBS=-L%(svn_lib_dir)s -Wl,--rpath -Wl,/usr/lib:/usr/local/lib:%(svn_lib_dir)s \ -+LDLIBS=-L%(svn_lib_dir)s -Wl,--rpath -Wl,%(svn_lib_dir)s \ - -lsvn_client-1 \ - -lsvn_diff-1 \ - -lsvn_repos-1 \ -- -lkrb5 -lcom_err -lexpat -lneon -+ -lcom_err -lexpat -lneon - - #include pysvn_common.mak - ''' -@@ -538,9 +538,9 @@ - PYTHON=%(python_exe)s - SVN_INCLUDE=%(svn_include)s - CCC=g++ --CCCFLAGS=-Wall -Wno-long-double -fPIC -fexceptions -frtti %(includes)s %(py_cflags)s %(debug_cflags)s -+CCCFLAGS=-Wall -fPIC -fexceptions -frtti %(includes)s %(py_cflags)s %(debug_cflags)s - CC=gcc --CCFLAGS=-Wall -Wno-long-double -fPIC %(includes)s %(debug_cflags)s -+CCFLAGS=-Wall -fPIC %(includes)s %(debug_cflags)s - PYCXX=%(pycxx_dir)s - PYCXXSRC=%(pycxx_src_dir)s - LDSHARED=g++ -bundle %(debug_cflags)s -u _PyMac_Error %(frameworks)s -@@ -563,9 +563,9 @@ - PYTHON=%(python_exe)s - SVN_INCLUDE=%(svn_include)s - CCC=g++ --CCCFLAGS=-Wall -Wno-long-double -fPIC -fexceptions -frtti %(includes)s %(py_cflags)s %(debug_cflags)s -+CCCFLAGS=-Wall -fPIC -fexceptions -frtti %(includes)s %(py_cflags)s %(debug_cflags)s - CC=gcc --CCFLAGS=-Wall -Wno-long-double -fPIC %(includes)s %(debug_cflags)s -+CCFLAGS=-Wall -fPIC %(includes)s %(debug_cflags)s - PYCXX=%(pycxx_dir)s - PYCXXSRC=%(pycxx_src_dir)s - LDSHARED=g++ -bundle %(debug_cflags)s %(frameworks)s diff --git a/dev-python/pysvn/pysvn-1.7.2.ebuild b/dev-python/pysvn/pysvn-1.7.2.ebuild deleted file mode 100644 index 343178e524a1..000000000000 --- a/dev-python/pysvn/pysvn-1.7.2.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pysvn/pysvn-1.7.2.ebuild,v 1.6 2010/09/30 08:47:31 grobian Exp $ - -EAPI="3" -SUPPORT_PYTHON_ABIS="1" - -inherit eutils multilib python 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 ~ppc ~x86 ~x86-freebsd ~x86-linux ~ppc-macos ~x86-solaris" -IUSE="doc examples" - -DEPEND="dev-lang/python - dev-vcs/subversion - >=dev-python/pycxx-6.1.0" -RDEPEND="${DEPEND}" - -src_prepare() { - # Skip test test-06 if executed as root to avoid failure. - epatch "${FILESDIR}/${PN}-1.7.1-skip_root_test.patch" - - # Don't use internal copy of dev-python/pycxx. - rm -fr Import - - python_copy_sources - - preparation() { - cd Source - if has "${PYTHON_ABI}" 2.4 2.5; then - "$(PYTHON)" setup.py backport || die "Backport failed" - fi - } - python_execute_function -s preparation -} - -src_configure() { - configuration() { - cd Source - "$(PYTHON)" setup.py configure \ - --pycxx-src-dir="${EPREFIX}/usr/share/python${PYTHON_ABI}/CXX" \ - --apr-inc-dir="${EPREFIX}/usr/include/apr-1" \ - --svn-root-dir="${EPREFIX}/usr" \ - || die "Configuration failed with Python {PYTHON_ABI}" - - sed -e 's:^\(CCFLAGS=\)\(.*\):\1$(CFLAGS) \2:g' \ - -e 's:^\(CCCFLAGS=\)\(.*\):\1$(CXXFLAGS) \2:g' \ - -e "/^CCC=/s:g++:$(tc-getCXX):" \ - -e "/^CC=/s:gcc:$(tc-getCC):" \ - -e "/^LDSHARED=/s:g++:$(tc-getCXX):" \ - -i Makefile \ - || die "sed failed in Makefile" - } - python_execute_function -s configuration -} - -src_compile() { - building() { - cd Source - emake - } - python_execute_function -s building -} - -src_test() { - testing() { - cd Source - emake test || die "test-pysvn.so failed with Python ${PYTHON_ABI}" - emake -C ../Tests || die "Tests failed with Python ${PYTHON_ABI}" - } - python_execute_function -s testing -} - -src_install() { - installation() { - cd Source/pysvn - exeinto "$(python_get_sitedir)/pysvn" - doexe _pysvn*$(get_modname) || die "doexe failed" - insinto "$(python_get_sitedir)/pysvn" - doins __init__.py || die "doins failed" - } - python_execute_function -s installation - - if use doc; then - dohtml -r Docs/ || die "dohtml failed" - fi - - if use examples; then - docinto examples - dodoc Examples/Client/* || die "dodoc examples failed" - fi -} - -pkg_postinst() { - python_mod_optimize pysvn -} - -pkg_postrm() { - python_mod_cleanup pysvn -} |