summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaleb Tennis <caleb@gentoo.org>2005-07-13 16:13:26 +0000
committerCaleb Tennis <caleb@gentoo.org>2005-07-13 16:13:26 +0000
commitb3eceef973f33b70d16742c3cdb7848488745ff6 (patch)
tree3b4418f7e65afb4662183f00dd84f8d16afb7634 /x11-libs
parentUpdate include_path. (diff)
downloadgentoo-2-b3eceef973f33b70d16742c3cdb7848488745ff6.tar.gz
gentoo-2-b3eceef973f33b70d16742c3cdb7848488745ff6.tar.bz2
gentoo-2-b3eceef973f33b70d16742c3cdb7848488745ff6.zip
Add visibility support to qt4 ebuild if gcc major version = 4
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/qt/ChangeLog5
-rw-r--r--x11-libs/qt/Manifest12
-rw-r--r--x11-libs/qt/qt-4.0.0.ebuild11
3 files changed, 13 insertions, 15 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 13fab611a9a9..be8ac9b963be 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.235 2005/07/07 13:51:30 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.236 2005/07/13 16:13:26 caleb Exp $
+
+ 13 Jul 2005; Caleb Tennis <caleb@gentoo.org> qt-4.0.0.ebuild:
+ Add visibility support to qt4 ebuild if gcc major version = 4
07 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> qt-3.3.4-r3.ebuild,
qt-3.3.4-r4.ebuild, qt-3.3.4-r5.ebuild, qt-3.3.4-r6.ebuild:
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 939e46977f11..6576f42346dc 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,10 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 0b2185dc5083c6626071d26ef79383f5 qt-3.3.4-r3.ebuild 9050
MD5 88875c77c2482de25169850cfc19faf5 qt-3.3.3-r1.ebuild 7987
MD5 94ed6ea2c0cd61ef0ccf21a1fa10796a qt-3.3.4-r5.ebuild 9197
-MD5 2eee5cc92ed819607456f3c10bce5776 qt-4.0.0.ebuild 5574
+MD5 c52fd9409d01e088c7b3a2d5514a4399 qt-4.0.0.ebuild 5718
MD5 98c2c897d6bb5fd3f7c6af49cd8decb7 qt-3.3.4-r2.ebuild 8565
MD5 29e408b179271fd0fdec5a0dbc752627 qt-3.3.4-r4.ebuild 9408
MD5 2ec08b7da4a92d3a653b9bd983d2fea2 ChangeLog 39221
@@ -40,10 +37,3 @@ MD5 8f75ba0e151481962fcb239dc216cf39 files/qt-3.3.4-0051-qtoolbar_77047.patch 12
MD5 471c09f2792eec732d715a983b7f7244 files/qt-3.3.3-immodule-20040819-event-inversion-20040908.diff 4150
MD5 eb6eb6b68c8f747b12a3a53efc4b6480 files/0038-dragobject-dont-prefer-unknown.patch 2551
MD5 e0a483959b1d3dad0fc58adc242624c1 files/qt-3.3.3-amd64-fullscreen.patch 1220
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCzm9cBXaUFmZvwyMRApfMAKCOp3NULhbqwcXcxr/V+uT8UVOSQwCdHhj8
-9MQCR7wQCQwRjUS7wp6bWtA=
-=9zmJ
------END PGP SIGNATURE-----
diff --git a/x11-libs/qt/qt-4.0.0.ebuild b/x11-libs/qt/qt-4.0.0.ebuild
index 64ced9b2cc39..54b5dbe7d516 100644
--- a/x11-libs/qt/qt-4.0.0.ebuild
+++ b/x11-libs/qt/qt-4.0.0.ebuild
@@ -1,8 +1,8 @@
# 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.0.ebuild,v 1.5 2005/07/08 12:19:22 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.0.0.ebuild,v 1.6 2005/07/13 16:13:26 caleb Exp $
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic toolchain-funcs
SRCTYPE="opensource-desktop"
DESCRIPTION="QT version ${PV}"
@@ -87,7 +87,12 @@ src_unpack() {
epatch ${FILESDIR}/qt4-rpath.patch
epatch ${FILESDIR}/qt4-nomkdir.patch
- sed -i -e "s:CFG_REDUCE_EXPORTS=auto:CFG_REDUCE_EXPORTS=no:" configure
+ 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() {