diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2011-02-20 15:03:10 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2011-02-20 15:03:10 +0000 |
| commit | 9ca102569c7b1a1f50ba262d427767db09f5ebbf (patch) | |
| tree | 5b1c0922ef4b2606a2cfbf082382d84299649125 /dev-python/pycurl | |
| parent | Add layman to tools-portage herd (diff) | |
| download | gentoo-2-9ca102569c7b1a1f50ba262d427767db09f5ebbf.tar.gz gentoo-2-9ca102569c7b1a1f50ba262d427767db09f5ebbf.tar.bz2 gentoo-2-9ca102569c7b1a1f50ba262d427767db09f5ebbf.zip | |
Restrict Jython ABIs. Fix linking (bug #355665).
(Portage version: 2.2.0_alpha24_p17/cvs/Linux x86_64)
Diffstat (limited to 'dev-python/pycurl')
| -rw-r--r-- | dev-python/pycurl/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/pycurl/files/pycurl-7.19.0-linking.patch | 13 | ||||
| -rw-r--r-- | dev-python/pycurl/pycurl-7.19.0.ebuild | 16 |
3 files changed, 28 insertions, 7 deletions
diff --git a/dev-python/pycurl/ChangeLog b/dev-python/pycurl/ChangeLog index 8561fc5881a0..dcfff163779e 100644 --- a/dev-python/pycurl/ChangeLog +++ b/dev-python/pycurl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/pycurl # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/ChangeLog,v 1.66 2011/02/05 22:39:50 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/ChangeLog,v 1.67 2011/02/20 15:03:10 arfrever Exp $ + + 20 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + pycurl-7.19.0.ebuild, +files/pycurl-7.19.0-linking.patch: + Restrict Jython ABIs. Fix linking (bug #355665). 05 Feb 2011; Markus Meier <maekke@gentoo.org> pycurl-7.19.0.ebuild: arm stable, bug #346985 diff --git a/dev-python/pycurl/files/pycurl-7.19.0-linking.patch b/dev-python/pycurl/files/pycurl-7.19.0-linking.patch new file mode 100644 index 000000000000..7fff5baad890 --- /dev/null +++ b/dev-python/pycurl/files/pycurl-7.19.0-linking.patch @@ -0,0 +1,13 @@ +--- setup.py ++++ setup.py +@@ -96,9 +96,7 @@ + include_dirs.append(e[2:]) + else: + extra_compile_args.append(e) +- libs = split_quoted( +- os.popen("'%s' --libs" % CURL_CONFIG).read()+\ +- os.popen("'%s' --static-libs" % CURL_CONFIG).read()) ++ libs = split_quoted(os.popen("'%s' --libs" % CURL_CONFIG).read()) + for e in libs: + if e[:2] == "-l": + libraries.append(e[2:]) diff --git a/dev-python/pycurl/pycurl-7.19.0.ebuild b/dev-python/pycurl/pycurl-7.19.0.ebuild index 16aaab2381d5..a654144aa118 100644 --- a/dev-python/pycurl/pycurl-7.19.0.ebuild +++ b/dev-python/pycurl/pycurl-7.19.0.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.0.ebuild,v 1.17 2011/02/05 22:39:50 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.0.ebuild,v 1.18 2011/02/20 15:03:10 arfrever Exp $ EAPI="3" PYTHON_DEPEND="2" SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.*" +RESTRICT_PYTHON_ABIS="3.* *-jython" -inherit distutils +inherit distutils eutils DESCRIPTION="python binding for curl/libcurl" HOMEPAGE="http://pycurl.sourceforge.net/ http://pypi.python.org/pypi/pycurl" @@ -23,6 +23,11 @@ RDEPEND="${DEPEND}" PYTHON_MODNAME="curl" +src_prepare() { + distutils_src_prepare + epatch "${FILESDIR}/${P}-linking.patch" +} + src_test() { testing() { PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" tests/test_internals.py -q @@ -35,11 +40,10 @@ src_install() { distutils_src_install - dohtml -r doc/* + dohtml -r doc/* || die "dohtml failed" if use examples; then insinto /usr/share/doc/${PF} - doins -r examples - doins -r tests + doins -r examples tests || die "doins failed" fi } |