diff options
| author |   Thomas Sachau <tommy@gentoo.org> | 2010-01-23 15:50:24 +0000 |
|---|---|---|
| committer | Thomas Sachau <tommy@gentoo.org> | 2010-01-23 15:50:24 +0000 |
| commit | 08dc3a9682e9f5e980d185bd6e5f9ff9addd1121 (patch) | |
| tree | f223e554d8c68d227b8e6bb27c7f508bdef36d34 /x11-libs/qt-gui | |
| parent | stable ppc, bug 296121 (diff) | |
| download | gentoo-2-08dc3a9682e9f5e980d185bd6e5f9ff9addd1121.tar.gz gentoo-2-08dc3a9682e9f5e980d185bd6e5f9ff9addd1121.tar.bz2 gentoo-2-08dc3a9682e9f5e980d185bd6e5f9ff9addd1121.zip | |
Move vars into src_unpack to work with current multilib-portage with ok from yngwin
(Portage version: 2.2_rc61-r1/cvs/Linux x86_64)
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.6.1.ebuild | 22 |
2 files changed, 17 insertions, 12 deletions
diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog index c7979b7063e4..229e49d0c4bf 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.94 2010/01/20 16:27:20 spatz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.95 2010/01/23 15:50:24 tommy Exp $ + + 23 Jan 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> + qt-gui-4.6.1.ebuild: + Move vars into src_unpack to work with current multilib-portage with ok + from yngwin 20 Jan 2010; Dror Levin <spatz@gentoo.org> qt-gui-4.6.1.ebuild: Remove warning with USE=raster as it seems more stable now. 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 259ce4a7862e..01869ec7160a 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.4 2010/01/20 16:27:20 spatz Exp $ +# $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 $ EAPI="2" inherit confutils eutils qt4-build @@ -41,6 +41,16 @@ DEPEND="${RDEPEND} xinerama? ( x11-proto/xineramaproto )" PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )" +pkg_setup() { + if ! use qt3support; then + ewarn "WARNING: if you need 'qtconfig', you _must_ enable qt3support." + fi + + confutils_use_depend_all gtk glib + qt4-build_pkg_setup +} + +src_unpack() { QT4_TARGET_DIRECTORIES=" src/gui src/scripttools @@ -58,16 +68,6 @@ tools/linguist/phrasebooks tools/linguist/shared tools/shared" -pkg_setup() { - if ! use qt3support; then - ewarn "WARNING: if you need 'qtconfig', you _must_ enable qt3support." - fi - - confutils_use_depend_all gtk glib - qt4-build_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" |