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

Package-Manager: portage-2.1.4.4

3 files changed, 37 insertions, 16 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/Manifest b/dev-db/qt-unixODBC/Manifest
index d9070f470704..2e833833dca5 100644
--- a/dev-db/qt-unixODBC/Manifest
+++ b/dev-db/qt-unixODBC/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX qt-no-rpath.patch 352 RMD160 2b5f24c23594531976f39723a4112261f4ad296a SHA1 4b2be020cb2ca4ffa499e0e2b7ba91e71203b7db SHA256 8cc1de2b9cebf6ef5a77d9deb18e7aa83d53258503076fb262d2981c1e25b1a4
 DIST qt-x11-free-3.3.4.tar.bz2 14439722 RMD160 3298331d545511956eb0910cbc5867a2a453ea1e SHA1 cb5f452bcdc9d2ed0201481f4b8f152edfda9523 SHA256 4e47251eddb0cef058e1bfd89c3320c03d966eba12760a781c95cf5468bf30b3
 DIST qt-x11-free-3.3.8.tar.gz 17393124 RMD160 65188370f6aa7093c9601783264825cf66b74eb4 SHA1 919e470beb32ec5d8e96c4dd1b6a10a2c79511a1 SHA256 975fa7b0c1e02f84d9013a9cde2123695fdd512ff4394ba89f530f4ee8597139
 EBUILD qt-unixODBC-3.3.4-r1.ebuild 1578 RMD160 22bbc102e2da90732927ab9d268d9258e7524bdf SHA1 d94ffc60a03c818e681a2476ab646c82dbc6b0bc SHA256 9d99af03630d79b921ccecaf2a67dd2d3f82fe9f1ed9a30ff57ac8b6982ffa92
-EBUILD qt-unixODBC-3.3.8.ebuild 1609 RMD160 f60ea2bc136a1d24e4a945459c24418393290612 SHA1 da375be920c5bf72091aa81eac2c6264a1cc5c7c SHA256 8b5ca9e5815e2dcfa40cfaefff382e87012de513b5f40d837efdace01ffd89a7
-MISC ChangeLog 4426 RMD160 318402262c2e657b883819c6d2f1694e9c1a22ff SHA1 7bb88d7c788de9ab6197d22efd97cebed4243b9e SHA256 7e19ee060290caa2849f3d4fe67ffe658f0f617c58ae9234cc61e2998f12a61c
+EBUILD qt-unixODBC-3.3.8.ebuild 2171 RMD160 554442bc186c812ef30a4978d0eb4b9dbd2e70b1 SHA1 de95942e359f6ffada85c79751b39e989b089838 SHA256 c9cc8c7bc819cb41b8df339c50df344b277577892fc234c502d76b17938bb9a8
+MISC ChangeLog 4570 RMD160 13da25862653be543f613a139eb507fd8c407fe2 SHA1 f477d409e4f7cd602aca2a33f90c4c56a1a6d497 SHA256 35e0b36b90ddae391b5de66f86fb0a4de2fa90d6d692bdefb29b98edceef6ad7
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH61PXfxJ68Jl1NeERApKSAJ44Mhi4JWr0XmP2uW05j0oksTzDeACdFJLD
+Ov0lSIuFLhyg88G62hbLW2c=
+=7nIr
+-----END PGP SIGNATURE-----
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"
 }