diff options
| author |   Ben de Groot <yngwin@gentoo.org> | 2010-02-10 20:11:56 +0000 |
|---|---|---|
| committer | Ben de Groot <yngwin@gentoo.org> | 2010-02-10 20:11:56 +0000 |
| commit | 05a664f39b7a7b87d6a85191043fe5cf995e2f79 (patch) | |
| tree | 017c7f062461da731555bb4c1038d418d181c6e9 /x11-libs/qt-gui | |
| parent | Move QT4_EXTRACT_DIRECTORIES stuff to pkg_setup, to fix compilation on Darwin... (diff) | |
| download | gentoo-2-05a664f39b7a7b87d6a85191043fe5cf995e2f79.tar.gz gentoo-2-05a664f39b7a7b87d6a85191043fe5cf995e2f79.tar.bz2 gentoo-2-05a664f39b7a7b87d6a85191043fe5cf995e2f79.zip | |
Move QT4_EXTRACT_DIRECTORIES stuff to pkg_setup, to fix compilation on Darwin (bug 302391).
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/qt-gui')
| -rw-r--r-- | x11-libs/qt-gui/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/qt-gui/qt-gui-4.6.1.ebuild | 39 |
2 files changed, 23 insertions, 22 deletions
diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog index b2eb1825fdaa..bb77bb309306 100644 --- a/x11-libs/qt-gui/ChangeLog +++ b/x11-libs/qt-gui/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-gui # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.96 2010/02/09 21:05:57 spatz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.97 2010/02/10 20:11:56 yngwin Exp $ + + 10 Feb 2010; Ben de Groot <yngwin@gentoo.org> qt-gui-4.6.1.ebuild: + Move QT4_EXTRACT_DIRECTORIES stuff to pkg_setup, to fix compilation on + Darwin (bug 302391). 09 Feb 2010; Dror Levin <spatz@gentoo.org> -qt-gui-4.6.0-r2.ebuild: Remove old. diff --git a/x11-libs/qt-gui/qt-gui-4.6.1.ebuild b/x11-libs/qt-gui/qt-gui-4.6.1.ebuild index 01869ec7160a..9cd37365f73f 100644 --- a/x11-libs/qt-gui/qt-gui-4.6.1.ebuild +++ b/x11-libs/qt-gui/qt-gui-4.6.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 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.6.1.ebuild,v 1.5 2010/01/23 15:50:24 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.6.1.ebuild,v 1.6 2010/02/10 20:11:56 yngwin Exp $ EAPI="2" inherit confutils eutils qt4-build @@ -47,26 +47,23 @@ pkg_setup() { fi confutils_use_depend_all gtk glib - qt4-build_pkg_setup -} -src_unpack() { -QT4_TARGET_DIRECTORIES=" -src/gui -src/scripttools -tools/designer -tools/linguist/linguist -src/plugins/imageformats/gif -src/plugins/imageformats/ico -src/plugins/imageformats/jpeg -src/plugins/inputmethods" - -QT4_EXTRACT_DIRECTORIES=" -include -src -tools/linguist/phrasebooks -tools/linguist/shared -tools/shared" + QT4_TARGET_DIRECTORIES=" + src/gui + src/scripttools + tools/designer + tools/linguist/linguist + src/plugins/imageformats/gif + src/plugins/imageformats/ico + src/plugins/imageformats/jpeg + src/plugins/inputmethods" + + QT4_EXTRACT_DIRECTORIES=" + include + src + tools/linguist/phrasebooks + tools/linguist/shared + tools/shared" use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer" use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng" @@ -74,7 +71,7 @@ tools/shared" use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets" QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}" - qt4-build_src_unpack + qt4-build_pkg_setup } src_prepare() { |