Make symbol export and examples handling part of configure options instead of seds...

Package-Manager: portage-2.1.2_rc2-r5

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 836d5ba3c5b13802e4e84e42870fff8a28477b0c..686e6b035bf56bc16341169e75b5485e3abfe323 100644 (file)
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.401 2006/12/05 13:18:04 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.402 2006/12/19 14:07:31 caleb Exp $
+
+  19 Dec 2006; Caleb Tennis <caleb@gentoo.org> qt-4.2.2.ebuild:
+  Make symbol export and examples handling part of configure options instead
+  of seds, now that Qt supports them (thanks to bug #157997)
 
   05 Dec 2006; Caleb Tennis <caleb@gentoo.org>
   +files/qt4-sqlite-configure.patch, qt-4.2.2.ebuild:

diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index bab523ac27617ebe79e60481e5ff83b898a9961f..b6aa0f6a81e9cf8cb7dd4fc56bba3ff822cb3a1a 100644 (file)
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -137,14 +137,14 @@ EBUILD qt-4.2.1.ebuild 7901 RMD160 0ca5067fa7e5abc88cf91aa4c662d3dd0b13d056 SHA1
 MD5 0d748095dcbdd4785ae4e10838d3f8bd qt-4.2.1.ebuild 7901
 RMD160 0ca5067fa7e5abc88cf91aa4c662d3dd0b13d056 qt-4.2.1.ebuild 7901
 SHA256 91be57c3a8c1e6376472c5a2aa48bac1845fba83691c0737bd2bdb2294713dab qt-4.2.1.ebuild 7901
-EBUILD qt-4.2.2.ebuild 7341 RMD160 ef4f991af577e699592518d214c66f3d7d97e76f SHA1 dd4aaa416cb557cf40061faf90759fbf91f19517 SHA256 5dc1ab1924897db3779517378937d9a91a01ad940691f83544fd4cb4b5994c5f
-MD5 97b9b077f89789bdb7101576763d8935 qt-4.2.2.ebuild 7341
-RMD160 ef4f991af577e699592518d214c66f3d7d97e76f qt-4.2.2.ebuild 7341
-SHA256 5dc1ab1924897db3779517378937d9a91a01ad940691f83544fd4cb4b5994c5f qt-4.2.2.ebuild 7341
-MISC ChangeLog 22844 RMD160 310bfe79b814e80c283bc6e464f99266c4c6b119 SHA1 d5f8609118b9a73bf31d200ec91a431ec61a1f3b SHA256 2cefa52c4838a7cdcaeeb0b9feee84faa8da879adb492dd05fd629249cc644c0
-MD5 3a957ad844048de6efcad4d791956d1d ChangeLog 22844
-RMD160 310bfe79b814e80c283bc6e464f99266c4c6b119 ChangeLog 22844
-SHA256 2cefa52c4838a7cdcaeeb0b9feee84faa8da879adb492dd05fd629249cc644c0 ChangeLog 22844
+EBUILD qt-4.2.2.ebuild 7208 RMD160 2004cee6f0c15ca716440af5f7747c700c506653 SHA1 9114b2f95136ab4ad13bfeb9dd3f5f85aea299a9 SHA256 1f1ff9a4036788657e4a4f1ba22432cf8684e6c63cd95d549b2a492a6d3eaa8f
+MD5 065eb74243f4a7161730d5da269aae64 qt-4.2.2.ebuild 7208
+RMD160 2004cee6f0c15ca716440af5f7747c700c506653 qt-4.2.2.ebuild 7208
+SHA256 1f1ff9a4036788657e4a4f1ba22432cf8684e6c63cd95d549b2a492a6d3eaa8f qt-4.2.2.ebuild 7208
+MISC ChangeLog 23047 RMD160 ed1a6f817dadfb85579ace713316c42441c8b47b SHA1 e5cbe87c137c5eedda1e96b24bd8af2e4e1f702d SHA256 16d5f8da8fa64b926ec04b0b6c160ee385a1245c4c0fdae83171765649529e8c
+MD5 3f40f5abb2abdd6bfc6eacd80a3c6f85 ChangeLog 23047
+RMD160 ed1a6f817dadfb85579ace713316c42441c8b47b ChangeLog 23047
+SHA256 16d5f8da8fa64b926ec04b0b6c160ee385a1245c4c0fdae83171765649529e8c ChangeLog 23047
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156

diff --git a/x11-libs/qt/qt-4.2.2.ebuild b/x11-libs/qt/qt-4.2.2.ebuild
index 5f8f9534603f091d02f88efd74518f91a4865025..a5ac4fcdadbf941144ea4d869c64b00a3c9421d3 100644 (file)
--- a/x11-libs/qt/qt-4.2.2.ebuild
+++ b/x11-libs/qt/qt-4.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.2.ebuild,v 1.6 2006/12/05 13:18:04 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.2.ebuild,v 1.7 2006/12/19 14:07:31 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -132,12 +132,6 @@ src_unpack() {
 
        cd ${S}
 
-       if [[ "$(gcc-major-version)" == "4" ]]; then
-               einfo "Visibility support: auto"
-       else
-               einfo "Visibility support: disabled"
-               sed -i -e "s:CFG_REDUCE_EXPORTS=auto:CFG_REDUCE_EXPORTS=no:" configure
-       fi
 }
 
 src_compile() {
@@ -146,6 +140,11 @@ src_compile() {
 
        [ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
 
+       # Disable visibility explicitly if gcc version isn't 4
+       if [[ "$(gcc-major-version)" != "4" ]]; then
+               myconf="${myconf} -no-reduce-exports"
+       fi
+
        myconf="${myconf} $(qt_use accessibility) $(qt_use cups) $(qt_use xinerama)"
        myconf="${myconf} $(qt_use opengl) $(qt_use nis)"
 
@@ -173,6 +172,11 @@ src_compile() {
 
        myconf="${myconf} -xrender -xrandr -xkb -xshape -sm"
 
+       if ! use examples; then
+               myconf="${myconf} -nomake examples"
+       fi
+
+
        ./configure -stl -verbose -largefile -confirm-license \
                -platform ${PLATFORM} -xplatform ${PLATFORM} \
                -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} \
@@ -180,10 +184,7 @@ src_compile() {
                -sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} \
                -examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} ${myconf} || die
 
-       emake sub-tools-all-ordered || die
-       if use examples; then
-               emake sub-examples-all-ordered || die
-       fi
+       emake all || die
 }
 
 src_install() {
@@ -194,7 +195,6 @@ src_install() {
 
        if use examples; then
                make INSTALL_ROOT=${D} sub-examples-install_subtargets || die
-               make INSTALL_ROOT=${D} sub-demos-install_subtargets || die
        fi
 
        make INSTALL_ROOT=${D} install_qmake || die