Fix detection of gcc-4. Replace 'cp -a' for bug #103487.

Package-Manager: portage-2.0.51.22-r2

3 files changed, 13 insertions, 15 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 66ac083467a8..886d3f0510c1 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.242 2005/08/22 13:22:01 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.243 2005/08/23 23:12:58 greg_g Exp $
+
+  23 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> qt-4.0.1.ebuild:
+  Fix detection of gcc-4. Replace 'cp -a' for bug #103487.
 
   22 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> qt-4.0.1.ebuild:
   Fix bug #75181 in a more generic way, that does not make assumptions on the
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 8e4cf6f54912..81400519c657 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,11 +1,11 @@
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 MD5 8a3143b4c6b3ed6f9407e6dad3887482 qt-3.3.4-r6.ebuild 9052
 MD5 0b2185dc5083c6626071d26ef79383f5 qt-3.3.4-r3.ebuild 9050
-MD5 ba3a2b6a9fa873f33e1fd8dce0168c6a ChangeLog 40269
+MD5 6bbc02ef58242f2511870e52d8609113 ChangeLog 40396
 MD5 cf386ea22e4be00ea893fecf5a6220ba qt-4.0.0.ebuild 5721
 MD5 98c2c897d6bb5fd3f7c6af49cd8decb7 qt-3.3.4-r2.ebuild 8565
 MD5 29eb571b78b63bccc11984b19cd7153b qt-3.3.4-r7.ebuild 9966
-MD5 d3c53cc908c90a6e6a93a404c744febd qt-4.0.1.ebuild 5744
+MD5 61c42aae7200acf2c43d12e30b80a50d qt-4.0.1.ebuild 5558
 MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
 MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.4-flickerfree_qiconview_buffered.patch 3347
 MD5 33975d39870dca02e85664411a93eae1 files/qt-3.3.4-gcc4.patch 1002
diff --git a/x11-libs/qt/qt-4.0.1.ebuild b/x11-libs/qt/qt-4.0.1.ebuild
index e4e0f60c44e1..cc2b89645d0d 100644
--- a/x11-libs/qt/qt-4.0.1.ebuild
+++ b/x11-libs/qt/qt-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.0.1.ebuild,v 1.2 2005/08/22 13:22:01 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.0.1.ebuild,v 1.3 2005/08/23 23:12:58 greg_g Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -64,7 +64,6 @@ qt_mkspecs_dir() {
 
 src_unpack() {
 	unpack ${A}
-
 	cd ${S}
 
 	sed -i -e 's:read acceptance:acceptance=yes:' configure
@@ -89,7 +88,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/qt4-nomkdir.patch
 
-	if [[ $(gcc-major-version = "4") ]]; then
+	if [[ "$(gcc-major-version)" == "4" ]]; then
 		einfo "Visibility support: auto"
 	else
 		einfo "Visibility support: disabled"
@@ -98,7 +97,6 @@ src_unpack() {
 }
 
 src_compile() {
-	export SYSCONF=${D}${QTPREFIXDIR}/etc/settings
 	export PATH="${S}/bin:${PATH}"
 	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
 
@@ -134,7 +132,6 @@ src_compile() {
 }
 
 src_install() {
-	export SYSCONF=${D}${QTPREFIXDIR}/etc/settings
 	export PATH="${S}/bin:${PATH}"
 	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
 
@@ -153,14 +150,13 @@ src_install() {
 	fi
 
 	# The QtAssistant header files aren't installed..not sure why
-	cp -a ${S}/include/QtAssistant ${D}/${QTHEADERDIR}/QtAssistant
+	cp -pPR ${S}/include/QtAssistant ${D}/${QTHEADERDIR}/QtAssistant
 
-	mkdir -p ${D}/${QTSYSCONFDIR}
+	keepdir "${QTSYSCONFDIR}"
 
 	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.la
 	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.prl
-	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/pkgconfig/*.pc
-	sed -i -e "s:${S}:${QTBASEDIR}:g" ${D}/${QTLIBDIR}/pkgconfig/*.pc
+	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.pc
 
 	# List all the multilib libdirs
 	local libdirs
@@ -168,12 +164,11 @@ src_install() {
 		libdirs="${libdirs}:/usr/${libdir}/qt4"
 	done
 
-	mkdir -p ${D}/etc/env.d
-
-	cat > ${D}/etc/env.d/44qt4 << EOF
+	cat > "${T}/44qt4" << EOF
 PATH=${QTBINDIR}
 ROOTPATH=${QTBINDIR}
 LDPATH=${libdirs:1}
 QMAKESPEC=$(qt_mkspecs_dir)
 EOF
+	doenvd "${T}/44qt4"
 }