resolve 75538, 78643

(Portage version: 2.0.51-r15)

5 files changed, 25 insertions, 14 deletions

diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index e7dc435042c5..05ddad7323db 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/cyrus-sasl
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.110 2004/12/23 20:23:36 ticho Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.111 2005/01/24 22:36:05 langthang Exp $
+
+  24 Jan 2005; Tuấn Văn <langthang@gentoo.org>
+  cyrus-sasl-2.1.20-r1.ebuild, cyrus-sasl-2.1.20.ebuild:
+  add fix for double spaces in CFLAGS. Bug #75538.
+  add ccache to the list of FEATURES that parallel build fail. Bug #78643.
 
   23 Dec 2004; Andrej Kacian <ticho@gentoo.org> cyrus-sasl-2.1.20-r1.ebuild:
   Really fix #64733.
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18-r2.ebuild
index aabefd9d0570..f1d77f20499c 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18-r2.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18-r2.ebuild,v 1.8 2004/09/21 23:38:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18-r2.ebuild,v 1.9 2005/01/24 22:36:05 langthang Exp $
 
 inherit eutils flag-o-matic gnuconfig
 
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.19-r1.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.19-r1.ebuild
index a79c530f58a1..0e4331358514 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.19-r1.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.19-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.19-r1.ebuild,v 1.9 2004/11/07 09:40:40 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.19-r1.ebuild,v 1.10 2005/01/24 22:36:05 langthang Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg
 
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r1.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r1.ebuild
index 22eb70d53a77..d27325b2095c 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r1.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r1.ebuild,v 1.2 2004/12/23 20:23:36 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20-r1.ebuild,v 1.3 2005/01/24 22:36:05 langthang Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg
 
@@ -35,6 +35,7 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool"
 
 pkg_setup() {
+
 	if use gdbm && use berkdb; then
 		echo
 		ewarn "You have both \"gdbm\" and \"berkdb\" in your USE flags."
@@ -150,10 +151,15 @@ src_compile() {
 		--with-dbpath=/etc/sasl2/sasldb2 \
 		${myconf} || die "econf failed"
 
+	# Fix PEBCAK in make.conf. Bug #75538.
+	CFLAGS="$(echo ${CFLAGS} | xargs)"
+	CXXFLAGS="$(echo ${CXXFLAGS} | xargs)"
+	LDFLAGS="$(echo ${LDFLAGS} | xargs)"
+
 	# Parallel build doesn't work.
-	# Parallel build doesn't like distcc?
-	if has distcc $FEATURES; then
-		einfo "You have \"distcc\" enabled"
+	# Parallel build doesn't like distcc/ccache? Bug #78643.
+	if has distcc $FEATURES || has ccache $FEATURES; then
+		einfo "You have \"distcc\" or \"ccache\" enabled"
 		einfo "build with MAKEOPTS=-j1"
 		emake -j1 || die "compile problem"
 	else
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20.ebuild
index 8733ab625bac..13ed149713c4 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20.ebuild,v 1.8 2004/12/21 17:13:30 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.20.ebuild,v 1.9 2005/01/24 22:36:05 langthang Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg
 
@@ -151,7 +151,7 @@ src_compile() {
 
 	# Parallel build doesn't work.
 	# Parallel build doesn't like distcc?
-	if has distcc $FEATURES; then
+	if has distcc $FEATURES || has ccache $FEATURES; then
 		einfo "You have \"distcc\" enabled"
 		einfo "build with MAKEOPTS=-j1"
 		emake -j1 || die "compile problem"