Respect user's CFLAGS (bug #181789). Fix quoting. Use doins.

(Portage version: 2.1.4.4)

2 files changed, 25 insertions, 14 deletions

diff --git a/dev-db/qt-unixODBC/ChangeLog b/dev-db/qt-unixODBC/ChangeLog
index 45c87d25e278..c4dea388b139 100644
--- a/dev-db/qt-unixODBC/ChangeLog
+++ b/dev-db/qt-unixODBC/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/qt-unixODBC
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/qt-unixODBC/ChangeLog,v 1.36 2008/03/13 17:02:35 ricmm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qt-unixODBC/ChangeLog,v 1.37 2008/03/27 07:59:09 zlin Exp $
+
+  27 Mar 2008; Bo Ørsted Andresen <zlin@gentoo.org>
+  qt-unixODBC-3.3.8.ebuild:
+  Respect user's CFLAGS (bug #181789). Fix quoting. Use doins.
 
   13 Mar 2008; <ricmm@gentoo.org> qt-unixODBC-3.3.4-r1.ebuild:
   Drop to ~mips due to unstable deps
diff --git a/dev-db/qt-unixODBC/qt-unixODBC-3.3.8.ebuild b/dev-db/qt-unixODBC/qt-unixODBC-3.3.8.ebuild
index 494181e9cddf..7d2ce8e154ec 100644
--- a/dev-db/qt-unixODBC/qt-unixODBC-3.3.8.ebuild
+++ b/dev-db/qt-unixODBC/qt-unixODBC-3.3.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/qt-unixODBC/qt-unixODBC-3.3.8.ebuild,v 1.9 2007/07/13 06:38:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qt-unixODBC/qt-unixODBC-3.3.8.ebuild,v 1.10 2008/03/27 07:59:09 zlin Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ LICENSE="|| ( QPL-1.0 GPL-2 )"
 SLOT="3"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 
-DEPEND="~x11-libs/qt-$PV
+DEPEND="~x11-libs/qt-${PV}
 	dev-db/unixODBC"
 
 S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
@@ -24,12 +24,21 @@ export PLATFORM=linux-g++
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/qt-no-rpath.patch
+	epatch "${FILESDIR}"/qt-no-rpath.patch
 
 	cp configure configure.orig
 	sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
+
+	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
+	       -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
+	       -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
+		   -e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \
+		   -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \
+		   -e "s:\<QMAKE_LINK\>.*=.*:QMAKE_LINK=$(tc-getCXX):" \
+		   -e "s:\<QMAKE_LINK_SHLIB\>.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \
+		   "${S}"/mkspecs/${PLATFORM}/qmake.conf || die "sed to fix CFLAGS failed"
 }
 
 src_compile() {
@@ -39,7 +48,7 @@ src_compile() {
 	# Let's just allow writing to these directories during Qt emerge
 	# as it makes Qt much happier.
 	addwrite "${QTBASE}/etc/settings"
-	addwrite "$HOME/.qt"
+	addwrite "${HOME}/.qt"
 
 	export YACC='byacc -d'
 
@@ -47,15 +56,13 @@ src_compile() {
 		-qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \
 		-system-libpng -lpthread -xft -platform ${PLATFORM} -xplatform \
 		${PLATFORM} -xrender -prefix ${QTBASE} -fast ${myconf} \
-		-dlopen-opengl -plugin-sql-odbc -L${QTBASE}/lib || die
-
-	export QTDIR=${S}
+		-dlopen-opengl -plugin-sql-odbc -L${QTBASE}/lib || die "configure failed"
 
-	cd $S/plugins/src/sqldrivers/odbc
-	emake || die
+	cd "${S}"/plugins/src/sqldrivers/odbc
+	emake || die "emake failed"
 }
 
 src_install() {
-	mkdir -p $D/$QTBASE/plugins/sqldrivers
-	cp $S/plugins/sqldrivers/libqsqlodbc.so $D/$QTBASE/plugins/sqldrivers/ || die
+	insinto ${QTBASE}/plugins/sqldrivers
+	doins "${S}"/plugins/sqldrivers/libqsqlodbc.so || die "doins failed"
 }