diff options
author | Ingmar Vanhassel <ingmar@gentoo.org> | 2008-04-10 13:40:47 +0000 |
---|---|---|
committer | Ingmar Vanhassel <ingmar@gentoo.org> | 2008-04-10 13:40:47 +0000 |
commit | 595cd1ee969d30d790d8100e62bfbb9dfe472c11 (patch) | |
tree | a6d2c21a936fdc3f206717edc4a9124b4961b240 /x11-libs/qt-gui | |
parent | Version bump qt-dbus to 4.4.0_rc1. Thanks to Bo Andresen and Bernd Steinhauser. (diff) | |
download | gentoo-2-595cd1ee969d30d790d8100e62bfbb9dfe472c11.tar.gz gentoo-2-595cd1ee969d30d790d8100e62bfbb9dfe472c11.tar.bz2 gentoo-2-595cd1ee969d30d790d8100e62bfbb9dfe472c11.zip |
Version bump qt-gui to 4.4.0_rc1. Thanks to Bo Andresen and Bernd Steinhauser.
(Portage version: 2.1.5_rc2)
Diffstat (limited to 'x11-libs/qt-gui')
-rw-r--r-- | x11-libs/qt-gui/ChangeLog | 7 | ||||
-rw-r--r-- | x11-libs/qt-gui/qt-gui-4.4.0_rc1.ebuild (renamed from x11-libs/qt-gui/qt-gui-4.4.0_beta1.ebuild) | 19 |
2 files changed, 16 insertions, 10 deletions
diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog index dbeeb626d96a..af2759e33fa5 100644 --- a/x11-libs/qt-gui/ChangeLog +++ b/x11-libs/qt-gui/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/qt-gui # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.3 2008/03/05 23:25:22 ingmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.4 2008/04/10 13:40:47 ingmar Exp $ + + 10 Apr 2008; Ingmar Vanhassel <ingmar@gentoo.org> + -qt-gui-4.4.0_beta1.ebuild, +qt-gui-4.4.0_rc1.ebuild: + Version bump qt-gui to 4.4.0_rc1. Thanks to Bo Andresen and Bernd + Steinhauser. 05 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org> -qt-gui-4.4.0_rc1.ebuild: diff --git a/x11-libs/qt-gui/qt-gui-4.4.0_beta1.ebuild b/x11-libs/qt-gui/qt-gui-4.4.0_rc1.ebuild index c7c1ae63ec1f..585750103974 100644 --- a/x11-libs/qt-gui/qt-gui-4.4.0_beta1.ebuild +++ b/x11-libs/qt-gui/qt-gui-4.4.0_rc1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.4.0_beta1.ebuild,v 1.1 2008/03/05 23:09:00 ingmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.4.0_rc1.ebuild,v 1.11 2008/04/10 13:40:47 ingmar Exp $ EAPI="1" inherit eutils qt4-build @@ -43,11 +43,12 @@ QT4_TARGET_DIRECTORIES=" src/gui tools/designer tools/linguist -src/tools/lrelease -src/tools/lupdate src/plugins/imageformats/gif src/plugins/imageformats/ico src/plugins/imageformats/jpeg" +QT4_EXTRACT_DIRECTORIES=" +src/tools/rcc/ +tools/shared/" pkg_setup() { use glib && QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} @@ -59,6 +60,10 @@ pkg_setup() { } src_unpack() { + use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer" + use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng" + use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff" + qt4-build_src_unpack # Don't build plugins this go around, because they depend on qt3support lib @@ -85,15 +90,11 @@ src_compile() { myconf="${myconf} -qt-gif -system-libpng -system-libjpeg -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc - -xrender -xrandr -xkb -xshape -sm" + -xrender -xrandr -xkb -xshape -sm -no-svg" # Explictly don't compile these packages. # Emerge "qt-webkit", "qt-phonon", etc for their functionality. - myconf="${myconf} -no-webkit -no-phonon -no-qdbus -no-opengl" - - use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer" - use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng" - use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff" + myconf="${myconf} -no-webkit -no-phonon -no-dbus -no-opengl" qt4-build_src_compile } |