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 | b6abacc7fe1c662f2c188a76f1dddff5a4f8b791 (patch) | |
| tree | ebc732adb4e6a81958e01fd126b27371acbc28b8 /x11-libs/qt-core | |
| parent | stable ppc, bug 296121 (diff) | |
| download | historical-b6abacc7fe1c662f2c188a76f1dddff5a4f8b791.tar.gz historical-b6abacc7fe1c662f2c188a76f1dddff5a4f8b791.tar.bz2 historical-b6abacc7fe1c662f2c188a76f1dddff5a4f8b791.zip | |
Move vars into src_unpack to work with current multilib-portage with ok from yngwin
Package-Manager: portage-2.2_rc61-r1/cvs/Linux x86_64
Diffstat (limited to 'x11-libs/qt-core')
| -rw-r--r-- | x11-libs/qt-core/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-libs/qt-core/qt-core-4.6.1.ebuild | 70 |
2 files changed, 41 insertions, 36 deletions
diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog index 256b1107b6c2..1baf84df877c 100644 --- a/x11-libs/qt-core/ChangeLog +++ b/x11-libs/qt-core/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/qt-core # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.86 2010/01/20 12:25:01 spatz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.87 2010/01/23 15:45:37 tommy Exp $ + + 23 Jan 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> + qt-core-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-core-4.6.1.ebuild, +files/qt-core-4.6.1-nolibx11.patch: diff --git a/x11-libs/qt-core/qt-core-4.6.1.ebuild b/x11-libs/qt-core/qt-core-4.6.1.ebuild index 2d288573cb66..9af716f5af43 100644 --- a/x11-libs/qt-core/qt-core-4.6.1.ebuild +++ b/x11-libs/qt-core/qt-core-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-core/qt-core-4.6.1.ebuild,v 1.2 2010/01/20 12:25:01 spatz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.6.1.ebuild,v 1.3 2010/01/23 15:45:37 tommy Exp $ EAPI="2" inherit qt4-build @@ -18,40 +18,6 @@ DEPEND="${RDEPEND} dev-util/pkgconfig" PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,qt3support] )" -QT4_TARGET_DIRECTORIES=" -src/tools/bootstrap -src/tools/moc -src/tools/rcc -src/tools/uic -src/corelib -src/xml -src/network -src/plugins/codecs -tools/linguist/lconvert -tools/linguist/lrelease -tools/linguist/lupdate" - -# Most ebuilds include almost everything for testing -# Will clear out unneeded directories after everything else works OK -QT4_EXTRACT_DIRECTORIES=" -include/Qt -include/QtCore -include/QtNetwork -include/QtScript -include/QtXml -src/plugins/plugins.pro -src/plugins/qpluginbase.pri -src/src.pro -src/3rdparty/des -src/3rdparty/harfbuzz -src/3rdparty/md4 -src/3rdparty/md5 -src/3rdparty/sha1 -src/3rdparty/easing -src/script -tools/linguist/shared -translations" - PATCHES=( "${FILESDIR}/${P}-nolibx11.patch" ) @@ -100,6 +66,40 @@ pkg_setup() { } src_unpack() { + QT4_TARGET_DIRECTORIES=" + src/tools/bootstrap + src/tools/moc + src/tools/rcc + src/tools/uic + src/corelib + src/xml + src/network + src/plugins/codecs + tools/linguist/lconvert + tools/linguist/lrelease + tools/linguist/lupdate" + + # Most ebuilds include almost everything for testing + # Will clear out unneeded directories after everything else works OK + QT4_EXTRACT_DIRECTORIES=" + include/Qt + include/QtCore + include/QtNetwork + include/QtScript + include/QtXml + src/plugins/plugins.pro + src/plugins/qpluginbase.pri + src/src.pro + src/3rdparty/des + src/3rdparty/harfbuzz + src/3rdparty/md4 + src/3rdparty/md5 + src/3rdparty/sha1 + src/3rdparty/easing + src/script + tools/linguist/shared + translations" + if use doc; then QT4_EXTRACT_DIRECTORIES="${QT4_EXTRACT_DIRECTORIES} doc/" |