summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2010-08-16 18:36:02 +0000
committerFabian Groffen <grobian@gentoo.org>2010-08-16 18:36:02 +0000
commit01ccb96ca0eae1413290166795d5f12e671a839b (patch)
tree9142565dde597094665a4f5e432bb0b046fb45a4 /dev-python/python-ldap
parentAdd the 'mouse' USE flag to make it possible to prevent elinks from capturing... (diff)
downloadhistorical-01ccb96ca0eae1413290166795d5f12e671a839b.tar.gz
historical-01ccb96ca0eae1413290166795d5f12e671a839b.tar.bz2
historical-01ccb96ca0eae1413290166795d5f12e671a839b.zip
Fix for Prefix, raise EAPI to 3, marked ~x86-solaris
Package-Manager: portage-2.2.01.15478-prefix/cvs/SunOS i386
Diffstat (limited to 'dev-python/python-ldap')
-rw-r--r--dev-python/python-ldap/ChangeLog6
-rw-r--r--dev-python/python-ldap/Manifest4
-rw-r--r--dev-python/python-ldap/python-ldap-2.3.11.ebuild13
3 files changed, 15 insertions, 8 deletions
diff --git a/dev-python/python-ldap/ChangeLog b/dev-python/python-ldap/ChangeLog
index 6d94883059c2..d6537007eb76 100644
--- a/dev-python/python-ldap/ChangeLog
+++ b/dev-python/python-ldap/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/python-ldap
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.83 2010/05/23 20:12:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.84 2010/08/16 18:36:02 grobian Exp $
+
+ 16 Aug 2010; Fabian Groffen <grobian@gentoo.org>
+ python-ldap-2.3.11.ebuild:
+ Fix for Prefix, raise EAPI to 3, marked ~x86-solaris
23 May 2010; Pacho Ramos <pacho@gentoo.org> python-ldap-2.3.11.ebuild:
stable amd64, bug 313149
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index 55b93bcec8a8..50deda011970 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,7 +1,7 @@
DIST python-ldap-2.3.11.tar.gz 119459 RMD160 1d8059be08bc6f17b114949191bc135805e0050f SHA1 bcc77e242b19092e4e2917e380be497ff4c9ce74 SHA256 bed37b5663b3f61e238477f261dbf0402e613c1ac0a4828de4e2e886850e60bf
DIST python-ldap-2.3.9.tar.gz 108209 RMD160 25d8555f548acdb418725f966f9ee94730f4ed77 SHA1 8d558259bfcda02e6b6be79e8dea18f744367dd5 SHA256 62f75b21c5ee744408c9d8b59878328b3bdf47899d30e8abf0c09b3ffb893ed4
DIST python-ldap-docs-html-2.3.7.tar.gz 90650 RMD160 51a08f7008e36c360007f271a2e93de1b3f1adfa SHA1 246bcd4c164aa7f8cde9caae82d1a72fee5504ab SHA256 0e15675025504904cdbc2c5b23deba9149ab8b199b31cf7d532db57e4ef09102
-EBUILD python-ldap-2.3.11.ebuild 1833 RMD160 e570d960c245e7b6efe17e0248003c84d7d405ca SHA1 09809cd264873876ee795cd55450bb28a7ad4405 SHA256 0c534e50f4623e53524cc5e293871191f94e7930f713b32a78abd5799bf84475
+EBUILD python-ldap-2.3.11.ebuild 1974 RMD160 fc6421cd76981df479bd1ea5112e5bba8708e681 SHA1 aa83ad092ee7bf2d57148b0097e1127e360b9d9d SHA256 af6260cf05035db4b17838f42021f269860f60df9a2b99f811122554d43ee60b
EBUILD python-ldap-2.3.9.ebuild 1833 RMD160 2bad72e02af17c471c925707eb91102d867bd2d6 SHA1 5b20d314cb2f16a884f418af247d6de3ac7ff2ab SHA256 46f086b3da8176ac5df51f1b9a9e0826e21abf868dd3ebe30d365291947a62c8
-MISC ChangeLog 10521 RMD160 f8006e3f97e7f9644e3710202fd58ca63426d059 SHA1 c2d7142e69a2c59240ee6ab15eded7c9ca3af3f2 SHA256 a7810b961b129e47619643473a28b001dba7458f6a6389f51d6c49a9ee5ec13d
+MISC ChangeLog 10659 RMD160 01bb60e9020802f634970521466baafb6f356b5a SHA1 8b86cfd100f09458f0310179ac9d2ec40ff1a843 SHA256 0a3efd45b74fd5e71d564083fca62c9134276ead61510c223dd1bde0e9bf6bee
MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
diff --git a/dev-python/python-ldap/python-ldap-2.3.11.ebuild b/dev-python/python-ldap/python-ldap-2.3.11.ebuild
index 06dbe9829b6e..adb88bd565e6 100644
--- a/dev-python/python-ldap/python-ldap-2.3.11.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.3.11.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.3.11.ebuild,v 1.8 2010/05/24 19:09:35 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.3.11.ebuild,v 1.9 2010/08/16 18:36:02 grobian Exp $
-EAPI="2"
+EAPI="3"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
@@ -17,7 +17,7 @@ SRC_URI="http://pypi.python.org/packages/source/p/python-ldap/${P}.tar.gz
LICENSE="PYTHON"
SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-solaris"
IUSE="doc examples sasl ssl"
RDEPEND=">=net-nds/openldap-2.4
@@ -30,10 +30,13 @@ DOCS="CHANGES README"
PYTHON_MODNAME="dsml.py ldapurl.py ldif.py ldap"
src_prepare() {
+ local rpath=
+ # sloppy logic, maybe better check if compiler links with GNU-ld
+ [[ ${CHOST} != *-darwin* ]] && rpath="-Wl,-rpath=${EPREFIX}/usr/$(get_libdir)/sasl2"
# Note: we can't add /usr/lib and /usr/lib/sasl2 to library_dirs due to a bug in py2.4
sed -e "s:^library_dirs =.*:library_dirs =:" \
- -e "s:^include_dirs =.*:include_dirs = /usr/include /usr/include/sasl:" \
- -e "s:\(extra_compile_args =\).*:\1\nextra_link_args = -Wl,-rpath=/usr/$(get_libdir) -Wl,-rpath=/usr/$(get_libdir)/sasl2:" \
+ -e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
+ -e "s:\(extra_compile_args =\).*:\1\nextra_link_args = ${rpath}:" \
-i setup.cfg || die "error fixing setup.cfg"
local mylibs="ldap"