Unquote eprefix in sed call, bug 475072.

(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

7 files changed, 20 insertions, 15 deletions

diff --git a/dev-python/python-ldap/ChangeLog b/dev-python/python-ldap/ChangeLog
index bc4e33a37dd6..128634f047b5 100644
--- a/dev-python/python-ldap/ChangeLog
+++ b/dev-python/python-ldap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/python-ldap
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.127 2013/06/27 18:01:50 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.128 2013/07/02 14:51:21 floppym Exp $
+
+  02 Jul 2013; Mike Gilbert <floppym@gentoo.org> python-ldap-2.3.13.ebuild,
+  python-ldap-2.4.10-r1.ebuild, python-ldap-2.4.10.ebuild,
+  python-ldap-2.4.12.ebuild, python-ldap-2.4.13.ebuild, python-ldap-9999.ebuild:
+  Unquote eprefix in sed call, bug 475072.
 
   27 Jun 2013; Michael Weber <xmw@gentoo.org> python-ldap-9999.ebuild:
   no parallel, in-source build, fix python2.5 syntax via sed.
diff --git a/dev-python/python-ldap/python-ldap-2.3.13.ebuild b/dev-python/python-ldap/python-ldap-2.3.13.ebuild
index bcb3b624c354..c27089897541 100644
--- a/dev-python/python-ldap/python-ldap-2.3.13.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.3.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.13.ebuild,v 1.15 2013/06/27 14:29:10 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.3.13.ebuild,v 1.16 2013/07/02 14:51:21 floppym Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -34,10 +34,10 @@ 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"
+	[[ ${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 = \"${EPREFIX}\"/usr/include \"${EPREFIX}\"/usr/include/sasl:" \
+		-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"
 
diff --git a/dev-python/python-ldap/python-ldap-2.4.10-r1.ebuild b/dev-python/python-ldap/python-ldap-2.4.10-r1.ebuild
index cd676f9a5861..e7fbd54a2b94 100644
--- a/dev-python/python-ldap/python-ldap-2.4.10-r1.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.4.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.4.10-r1.ebuild,v 1.4 2013/06/27 14:29:10 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.10-r1.ebuild,v 1.5 2013/07/02 14:51:21 floppym Exp $
 
 EAPI=5
 
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}
 
 python_prepare_all() {
 	sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
-		-e "s:^include_dirs =.*:include_dirs = \"${EPREFIX}\"/usr/include \"${EPREFIX}\"/usr/include/sasl:" \
+		-e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
 		-i setup.cfg || die "error fixing setup.cfg"
 
 	local mylibs="ldap"
diff --git a/dev-python/python-ldap/python-ldap-2.4.10.ebuild b/dev-python/python-ldap/python-ldap-2.4.10.ebuild
index 63352e6cca5b..b8bb233c126a 100644
--- a/dev-python/python-ldap/python-ldap-2.4.10.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.4.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.4.10.ebuild,v 1.10 2013/06/27 14:29:10 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.10.ebuild,v 1.11 2013/07/02 14:51:21 floppym Exp $
 
 EAPI=4
 
@@ -33,10 +33,10 @@ 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"
+	[[ ${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 = \"${EPREFIX}\"/usr/include \"${EPREFIX}\"/usr/include/sasl:" \
+		-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"
 
diff --git a/dev-python/python-ldap/python-ldap-2.4.12.ebuild b/dev-python/python-ldap/python-ldap-2.4.12.ebuild
index 244926f6a337..237332014059 100644
--- a/dev-python/python-ldap/python-ldap-2.4.12.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.4.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.4.12.ebuild,v 1.2 2013/06/27 14:29:10 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.12.ebuild,v 1.3 2013/07/02 14:51:21 floppym Exp $
 
 EAPI=5
 
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}
 
 python_prepare_all() {
 	sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
-		-e "s:^include_dirs =.*:include_dirs = \"${EPREFIX}\"/usr/include \"${EPREFIX}\"/usr/include/sasl:" \
+		-e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
 		-i setup.cfg || die "error fixing setup.cfg"
 
 	local mylibs="ldap"
diff --git a/dev-python/python-ldap/python-ldap-2.4.13.ebuild b/dev-python/python-ldap/python-ldap-2.4.13.ebuild
index cfd15ed99768..204a491fdb9a 100644
--- a/dev-python/python-ldap/python-ldap-2.4.13.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.4.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.4.13.ebuild,v 1.2 2013/06/27 14:29:10 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.13.ebuild,v 1.3 2013/07/02 14:51:21 floppym Exp $
 
 EAPI=5
 
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}
 
 python_prepare_all() {
 	sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
-		-e "s:^include_dirs =.*:include_dirs = \"${EPREFIX}\"/usr/include \"${EPREFIX}\"/usr/include/sasl:" \
+		-e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
 		-i setup.cfg || die "error fixing setup.cfg"
 
 	local mylibs="ldap"
diff --git a/dev-python/python-ldap/python-ldap-9999.ebuild b/dev-python/python-ldap/python-ldap-9999.ebuild
index e77410293b01..c955ca298710 100644
--- a/dev-python/python-ldap/python-ldap-9999.ebuild
+++ b/dev-python/python-ldap/python-ldap-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-9999.ebuild,v 1.2 2013/06/27 18:01:50 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-9999.ebuild,v 1.3 2013/07/02 14:51:21 floppym Exp $
 
 EAPI=5
 
@@ -34,7 +34,7 @@ RESTRICT=test
 
 python_prepare_all() {
 	sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
-		-e "s:^include_dirs =.*:include_dirs = \"${EPREFIX}\"/usr/include \"${EPREFIX}\"/usr/include/sasl:" \
+		-e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
 		-i setup.cfg || die "error fixing setup.cfg"
 
 	local mylibs="ldap"