* [gentoo-commits] proj/qt:master commit in: dev-qt/qttest/, dev-qt/pixeltool/, dev-qt/qtmultimedia/, dev-qt/qdbusviewer/, ...
@ 2013-10-20 21:22 Davide Pesavento
0 siblings, 0 replies; 4+ messages in thread
From: Davide Pesavento @ 2013-10-20 21:22 UTC (permalink / raw
To: gentoo-commits
commit: 0e4a8d618f29374ba9b2518a113177f1addddb13
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Oct 20 21:06:47 2013 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 21:06:47 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0e4a8d61
[Qt4] Drop support for USE='c++0x' on 4.8.5 and later.
Upstream confirmed that there's no point in building Qt4 with
C++11 enabled. Real benefits in the libs came only with Qt5.
---
dev-qt/assistant/metadata.xml | 1 -
dev-qt/designer/metadata.xml | 1 -
dev-qt/linguist/metadata.xml | 1 -
dev-qt/pixeltool/metadata.xml | 1 -
dev-qt/qdbusviewer/metadata.xml | 1 -
dev-qt/qt3support/metadata.xml | 1 -
dev-qt/qtbearer/metadata.xml | 1 -
dev-qt/qtcore/metadata.xml | 1 -
dev-qt/qtdbus/metadata.xml | 1 -
dev-qt/qtdeclarative/metadata.xml | 1 -
dev-qt/qtdemo/metadata.xml | 1 -
dev-qt/qtgui/metadata.xml | 1 -
dev-qt/qthelp/metadata.xml | 1 -
dev-qt/qtmultimedia/metadata.xml | 1 -
dev-qt/qtopengl/metadata.xml | 1 -
dev-qt/qtopenvg/metadata.xml | 1 -
dev-qt/qtphonon/metadata.xml | 1 -
dev-qt/qtscript/metadata.xml | 1 -
dev-qt/qtsql/metadata.xml | 1 -
dev-qt/qtsvg/metadata.xml | 1 -
dev-qt/qttest/metadata.xml | 1 -
dev-qt/qtxmlpatterns/metadata.xml | 3 ---
eclass/qt4-build.eclass | 12 +++++++-----
23 files changed, 7 insertions(+), 29 deletions(-)
diff --git a/dev-qt/assistant/metadata.xml b/dev-qt/assistant/metadata.xml
index 782c134..cf47457 100644
--- a/dev-qt/assistant/metadata.xml
+++ b/dev-qt/assistant/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
</use>
diff --git a/dev-qt/designer/metadata.xml b/dev-qt/designer/metadata.xml
index 52fb855..d44ee0b 100644
--- a/dev-qt/designer/metadata.xml
+++ b/dev-qt/designer/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="declarative">Build the qdeclarativeview plugin</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
diff --git a/dev-qt/linguist/metadata.xml b/dev-qt/linguist/metadata.xml
index 782c134..cf47457 100644
--- a/dev-qt/linguist/metadata.xml
+++ b/dev-qt/linguist/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
</use>
diff --git a/dev-qt/pixeltool/metadata.xml b/dev-qt/pixeltool/metadata.xml
index 782c134..cf47457 100644
--- a/dev-qt/pixeltool/metadata.xml
+++ b/dev-qt/pixeltool/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
</use>
diff --git a/dev-qt/qdbusviewer/metadata.xml b/dev-qt/qdbusviewer/metadata.xml
index 782c134..cf47457 100644
--- a/dev-qt/qdbusviewer/metadata.xml
+++ b/dev-qt/qdbusviewer/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
</use>
diff --git a/dev-qt/qt3support/metadata.xml b/dev-qt/qt3support/metadata.xml
index 782c134..cf47457 100644
--- a/dev-qt/qt3support/metadata.xml
+++ b/dev-qt/qt3support/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
</use>
diff --git a/dev-qt/qtbearer/metadata.xml b/dev-qt/qtbearer/metadata.xml
index 782c134..cf47457 100644
--- a/dev-qt/qtbearer/metadata.xml
+++ b/dev-qt/qtbearer/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
</use>
diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml
index 3e66481..683d8f9 100644
--- a/dev-qt/qtcore/metadata.xml
+++ b/dev-qt/qtcore/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
<flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>
diff --git a/dev-qt/qtdbus/metadata.xml b/dev-qt/qtdbus/metadata.xml
index 782c134..cf47457 100644
--- a/dev-qt/qtdbus/metadata.xml
+++ b/dev-qt/qtdbus/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
</use>
diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml
index d3709a4..a69e279 100644
--- a/dev-qt/qtdeclarative/metadata.xml
+++ b/dev-qt/qtdeclarative/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
<flag name="localstorage">Build the LocalStorage import for
diff --git a/dev-qt/qtdemo/metadata.xml b/dev-qt/qtdemo/metadata.xml
index feb2119..a03d28e 100644
--- a/dev-qt/qtdemo/metadata.xml
+++ b/dev-qt/qtdemo/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="dbus">Build QtDBus examples and demos</flag>
<flag name="declarative">Build QtDeclarative examples and demos</flag>
<flag name="exceptions">Add support for exceptions - like catching them
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index afe74d5..1cae8ab 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="egl">Use EGL instead of default GLX to manage OpenGL contexts</flag>
<flag name="eglfs">Compile EGL Full Screen/Single Surface support</flag>
<flag name="evdev">Enable evdev input support</flag>
diff --git a/dev-qt/qthelp/metadata.xml b/dev-qt/qthelp/metadata.xml
index 839b641..ada30bc 100644
--- a/dev-qt/qthelp/metadata.xml
+++ b/dev-qt/qthelp/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="compat">Build the extra compatibility layer required by a few packages, see
http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/</flag>
<flag name="exceptions">Add support for exceptions - like catching them
diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml
index ac4af81..b4f8d68 100644
--- a/dev-qt/qtmultimedia/metadata.xml
+++ b/dev-qt/qtmultimedia/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
<flag name="qml">Build QML/QtQuick bindings</flag>
diff --git a/dev-qt/qtopengl/metadata.xml b/dev-qt/qtopengl/metadata.xml
index 573bc7a..36aa10d 100644
--- a/dev-qt/qtopengl/metadata.xml
+++ b/dev-qt/qtopengl/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="egl">Use EGL instead of default GLX to manage OpenGL
contexts on the desktop</flag>
<flag name="exceptions">Add support for exceptions - like catching them
diff --git a/dev-qt/qtopenvg/metadata.xml b/dev-qt/qtopenvg/metadata.xml
index 472a8cb..ae3a5c3 100644
--- a/dev-qt/qtopenvg/metadata.xml
+++ b/dev-qt/qtopenvg/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="exceptions">Build with support for exceptions</flag>
<flag name="qt3support">Enable the Qt3Support libraries for Qt4</flag>
</use>
diff --git a/dev-qt/qtphonon/metadata.xml b/dev-qt/qtphonon/metadata.xml
index 46bceeb..d61fe34 100644
--- a/dev-qt/qtphonon/metadata.xml
+++ b/dev-qt/qtphonon/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
<flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
diff --git a/dev-qt/qtscript/metadata.xml b/dev-qt/qtscript/metadata.xml
index 997a1cb..32bcee1 100644
--- a/dev-qt/qtscript/metadata.xml
+++ b/dev-qt/qtscript/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
<flag name="scripttools">Build the QtScriptTools module (requires QtWidgets)</flag>
diff --git a/dev-qt/qtsql/metadata.xml b/dev-qt/qtsql/metadata.xml
index 1591ac1..0ea362d 100644
--- a/dev-qt/qtsql/metadata.xml
+++ b/dev-qt/qtsql/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
<flag name="qt3support">Enable the Qt3Support libraries for Qt4</flag>
diff --git a/dev-qt/qtsvg/metadata.xml b/dev-qt/qtsvg/metadata.xml
index 782c134..cf47457 100644
--- a/dev-qt/qtsvg/metadata.xml
+++ b/dev-qt/qtsvg/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
</use>
diff --git a/dev-qt/qttest/metadata.xml b/dev-qt/qttest/metadata.xml
index 782c134..cf47457 100644
--- a/dev-qt/qttest/metadata.xml
+++ b/dev-qt/qttest/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<herd>qt</herd>
<use>
- <flag name="c++0x">Build Qt using the C++11 standard</flag>
<flag name="exceptions">Add support for exceptions - like catching them
inside the event loop (recommended by Nokia)</flag>
</use>
diff --git a/dev-qt/qtxmlpatterns/metadata.xml b/dev-qt/qtxmlpatterns/metadata.xml
index 163c76a..9d5bff1 100644
--- a/dev-qt/qtxmlpatterns/metadata.xml
+++ b/dev-qt/qtxmlpatterns/metadata.xml
@@ -2,9 +2,6 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>qt</herd>
- <use>
- <flag name="c++0x">Build Qt using the C++11 standard</flag>
- </use>
<upstream>
<bugs-to>https://bugreports.qt-project.org/</bugs-to>
<doc>http://qt-project.org/doc/</doc>
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 3162f18..5ca3423 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -43,7 +43,9 @@ case ${QT4_BUILD_TYPE} in
esac
IUSE="aqua debug pch"
-[[ ${CATEGORY}/${PN} != dev-qt/qtwebkit ]] && IUSE+=" c++0x"
+if ! version_is_at_least 4.8.5; then
+ [[ ${CATEGORY}/${PN} != dev-qt/qtwebkit ]] && IUSE+=" c++0x"
+fi
[[ ${CATEGORY}/${PN} != dev-qt/qtxmlpatterns ]] && IUSE+=" +exceptions"
DEPEND="virtual/pkgconfig"
@@ -101,10 +103,10 @@ qt4-build_pkg_setup() {
qt4-build_src_unpack() {
setqtenv
- if ! version_is_at_least 4.1 $(gcc-version); then
- ewarn "Using a GCC version lower than 4.1 is not supported."
- elif use_if_iuse c++0x && ! version_is_at_least 4.4 $(gcc-version); then
- ewarn "USE=c++0x requires GCC 4.4 or later."
+ if ! version_is_at_least 4.4 $(gcc-version); then
+ ewarn
+ ewarn "Using a GCC version lower than 4.4 is not supported."
+ ewarn
fi
if [[ ${CATEGORY}/${PN} == dev-qt/qtwebkit ]]; then
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qttest/, dev-qt/pixeltool/, dev-qt/qtmultimedia/, dev-qt/qdbusviewer/, ...
@ 2014-05-23 0:11 Davide Pesavento
0 siblings, 0 replies; 4+ messages in thread
From: Davide Pesavento @ 2014-05-23 0:11 UTC (permalink / raw
To: gentoo-commits
commit: 3d84d817b714b4862665cdef9a265334f0e82bb8
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri May 23 00:09:04 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri May 23 00:09:04 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=3d84d817
[Qt4] Migrate all live ebuilds to EAPI=5 and qt4-build-multilib.eclass
---
dev-qt/assistant/assistant-4.8.9999.ebuild | 24 ++---
dev-qt/designer/designer-4.8.9999.ebuild | 28 +++---
dev-qt/linguist/linguist-4.8.9999.ebuild | 22 ++---
dev-qt/pixeltool/pixeltool-4.8.9999.ebuild | 22 ++---
dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild | 22 ++---
dev-qt/qt3support/qt3support-4.8.9999.ebuild | 29 +++---
dev-qt/qtbearer/qtbearer-4.8.9999.ebuild | 31 +++---
dev-qt/qtcore/qtcore-4.8.9999.ebuild | 106 ++++++++++-----------
dev-qt/qtdbus/qtdbus-4.8.9999.ebuild | 41 ++++----
dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild | 52 +++++-----
dev-qt/qtdemo/qtdemo-4.8.9999.ebuild | 36 ++++---
dev-qt/qtgui/qtgui-4.8.9999.ebuild | 51 +++++-----
dev-qt/qthelp/qthelp-4.8.9999.ebuild | 56 +++++------
dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild | 37 ++++---
dev-qt/qtopengl/qtopengl-4.8.9999.ebuild | 46 ++++-----
dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild | 49 +++++-----
dev-qt/qtphonon/qtphonon-4.8.9999.ebuild | 40 ++++----
dev-qt/qtscript/qtscript-4.8.9999.ebuild | 39 ++++----
dev-qt/qtsql/qtsql-4.8.9999.ebuild | 35 ++++---
dev-qt/qtsvg/qtsvg-4.8.9999.ebuild | 51 +++++-----
dev-qt/qttest/qttest-4.8.9999.ebuild | 25 +++--
dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild | 31 +++---
dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild | 45 ++++-----
23 files changed, 430 insertions(+), 488 deletions(-)
diff --git a/dev-qt/assistant/assistant-4.8.9999.ebuild b/dev-qt/assistant/assistant-4.8.9999.ebuild
index 64b67e3..8508bf8 100644
--- a/dev-qt/assistant/assistant-4.8.9999.ebuild
+++ b/dev-qt/assistant/assistant-4.8.9999.ebuild
@@ -4,10 +4,10 @@
EAPI=5
-inherit eutils qt4-build
+inherit eutils qt4-build-multilib
DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
@@ -29,21 +29,17 @@ PATCHES=(
"${FILESDIR}/${PN}-4.8.2+gcc-4.7.patch"
)
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="tools/assistant/tools/assistant"
- QT4_EXTRACT_DIRECTORIES="
- include
- src
- tools"
-
- qt4-build_pkg_setup
-}
+QT4_TARGET_DIRECTORIES="tools/assistant/tools/assistant"
+QT4_EXTRACT_DIRECTORIES="
+ include
+ src
+ tools"
src_prepare() {
# bug 401173
use webkit || PATCHES+=("${FILESDIR}/disable-webkit.patch")
- qt4-build_src_prepare
+ qt4-build-multilib_src_prepare
}
src_configure() {
@@ -54,11 +50,11 @@ src_configure() {
-fontconfig -no-multimedia -no-opengl -no-phonon -no-svg -no-xmlpatterns
$(qt_use webkit)"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
src_install() {
- qt4-build_src_install
+ qt4-build-multilib_src_install
doicon tools/assistant/tools/assistant/images/assistant.png
make_desktop_entry assistant Assistant assistant 'Qt;Development;Documentation'
diff --git a/dev-qt/designer/designer-4.8.9999.ebuild b/dev-qt/designer/designer-4.8.9999.ebuild
index 17368dd..0b75a86 100644
--- a/dev-qt/designer/designer-4.8.9999.ebuild
+++ b/dev-qt/designer/designer-4.8.9999.ebuild
@@ -4,10 +4,10 @@
EAPI=5
-inherit eutils qt4-build
+inherit eutils qt4-build-multilib
DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
@@ -28,18 +28,14 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="tools/designer"
- QT4_EXTRACT_DIRECTORIES="
- include
- src
- tools"
-
- qt4-build_pkg_setup
-}
+QT4_TARGET_DIRECTORIES="tools/designer"
+QT4_EXTRACT_DIRECTORIES="
+ include
+ src
+ tools"
src_prepare() {
- qt4-build_src_prepare
+ qt4-build-multilib_src_prepare
local plugin
for plugin in ${DESIGNER_PLUGINS}; do
@@ -55,11 +51,11 @@ src_configure() {
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
src_install() {
- qt4-build_src_install
+ qt4-build-multilib_src_install
# qt-creator
# some qt-creator headers are located
@@ -69,9 +65,9 @@ src_install() {
# So instead of installing both, we create the private folder
# and drop tools/designer/src/lib/* headers in it.
if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
- insinto "${QTLIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/
+ insinto "${QT4_LIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/
else
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtDesigner/private/
+ insinto "${QT4_HEADERDIR#${EPREFIX}}"/QtDesigner/private/
fi
doins "${S}"/tools/designer/src/lib/shared/*
doins "${S}"/tools/designer/src/lib/sdk/*
diff --git a/dev-qt/linguist/linguist-4.8.9999.ebuild b/dev-qt/linguist/linguist-4.8.9999.ebuild
index a0a367a..eec9dc2 100644
--- a/dev-qt/linguist/linguist-4.8.9999.ebuild
+++ b/dev-qt/linguist/linguist-4.8.9999.ebuild
@@ -4,10 +4,10 @@
EAPI=5
-inherit eutils qt4-build
+inherit eutils qt4-build-multilib
DESCRIPTION="Graphical tool for translating Qt applications"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
@@ -23,15 +23,11 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="tools/linguist/linguist"
- QT4_EXTRACT_DIRECTORIES="
- include
- src
- tools"
-
- qt4-build_pkg_setup
-}
+QT4_TARGET_DIRECTORIES="tools/linguist/linguist"
+QT4_EXTRACT_DIRECTORIES="
+ include
+ src
+ tools"
src_configure() {
myconf+="
@@ -40,11 +36,11 @@ src_configure() {
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
src_install() {
- qt4-build_src_install
+ qt4-build-multilib_src_install
newicon tools/linguist/linguist/images/icons/linguist-128-32.png linguist.png
make_desktop_entry linguist Linguist linguist 'Qt;Development;Translation'
diff --git a/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild b/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild
index 2f5a6fe..9086ea0 100644
--- a/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild
+++ b/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild
@@ -4,10 +4,10 @@
EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="Qt screen magnifier"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
@@ -23,16 +23,12 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="tools/pixeltool"
- QT4_EXTRACT_DIRECTORIES="
- include
- src/corelib
- src/gui
- tools/pixeltool"
-
- qt4-build_pkg_setup
-}
+QT4_TARGET_DIRECTORIES="tools/pixeltool"
+QT4_EXTRACT_DIRECTORIES="
+ include
+ src/corelib
+ src/gui
+ tools/pixeltool"
src_configure() {
myconf+="
@@ -41,5 +37,5 @@ src_configure() {
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild
index a87515a..09d4d01 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild
@@ -4,10 +4,10 @@
EAPI=5
-inherit eutils qt4-build
+inherit eutils qt4-build-multilib
DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
@@ -23,15 +23,11 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="tools/qdbus/qdbusviewer"
- QT4_EXTRACT_DIRECTORIES="
- include
- src
- tools/qdbus"
-
- qt4-build_pkg_setup
-}
+QT4_TARGET_DIRECTORIES="tools/qdbus/qdbusviewer"
+QT4_EXTRACT_DIRECTORIES="
+ include
+ src
+ tools/qdbus"
src_configure() {
myconf+="
@@ -40,11 +36,11 @@ src_configure() {
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
src_install() {
- qt4-build_src_install
+ qt4-build-multilib_src_install
newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
make_desktop_entry qdbusviewer QDBusViewer qdbusviewer 'Qt;Development'
diff --git a/dev-qt/qt3support/qt3support-4.8.9999.ebuild b/dev-qt/qt3support/qt3support-4.8.9999.ebuild
index 0bc8273..4b4927c 100644
--- a/dev-qt/qt3support/qt3support-4.8.9999.ebuild
+++ b/dev-qt/qt3support/qt3support-4.8.9999.ebuild
@@ -2,17 +2,18 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="The Qt3Support module for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
+
IUSE="+accessibility"
DEPEND="
@@ -22,24 +23,20 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/qt3support
- src/tools/uic3
- tools/porting"
+QT4_TARGET_DIRECTORIES="
+ src/qt3support
+ src/tools/uic3
+ tools/porting"
- QT4_EXTRACT_DIRECTORIES="
- src
- include
- tools"
-
- qt4-build_pkg_setup
-}
+QT4_EXTRACT_DIRECTORIES="
+ src
+ include
+ tools"
src_configure() {
myconf+="
-qt3support
$(qt_use accessibility)"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
diff --git a/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild b/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
index a0d6807..b941bbc 100644
--- a/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
+++ b/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
@@ -2,17 +2,18 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="The network bearer plugins for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
fi
+
IUSE="connman networkmanager"
DEPEND="
@@ -25,23 +26,23 @@ RDEPEND="${DEPEND}
networkmanager? ( net-misc/networkmanager )
"
-pkg_setup() {
- QT4_EXTRACT_DIRECTORIES="
- include/QtCore
- include/QtDBus
- include/QtNetwork
- src/corelib
- src/dbus
- src/network
- src/plugins/bearer
- src/plugins/qpluginbase.pri"
+QT4_EXTRACT_DIRECTORIES="
+ include/QtCore
+ include/QtDBus
+ include/QtNetwork
+ src/corelib
+ src/dbus
+ src/network
+ src/plugins/bearer
+ src/plugins/qpluginbase.pri"
+pkg_setup() {
QT4_TARGET_DIRECTORIES="
src/plugins/bearer/generic
$(use connman && echo src/plugins/bearer/connman)
$(use networkmanager && echo src/plugins/bearer/networkmanager)"
- qt4-build_pkg_setup
+ qt4-build-multilib_pkg_setup
}
src_configure() {
@@ -54,5 +55,5 @@ src_configure() {
-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index 2ac14dd..4c4f5a3 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -4,23 +4,23 @@
EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="Cross-platform application development framework"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
+
IUSE="+glib iconv icu qt3support ssl"
DEPEND="
sys-libs/zlib
glib? ( dev-libs/glib:2 )
icu? ( >=dev-libs/icu-49:= )
- ssl? ( dev-libs/openssl )
- !<x11-libs/cairo-1.10.2-r2
+ ssl? ( dev-libs/openssl:0 )
"
RDEPEND="${DEPEND}"
PDEPEND="
@@ -31,41 +31,39 @@ PATCHES=(
"${FILESDIR}/moc-boost-lexical-cast.patch"
)
-pkg_setup() {
- 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"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include
- 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/3rdparty/zlib_dependency.pri
- src/declarative
- src/gui
- src/script
- tools/shared
- tools/linguist/shared
- translations"
-
- qt4-build_pkg_setup
-}
+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"
+
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include
+ 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/3rdparty/zlib_dependency.pri
+ src/declarative
+ src/gui
+ src/script
+ tools/shared
+ tools/linguist/shared
+ translations"
+
+QCONFIG_DEFINE="QT_ZLIB"
src_prepare() {
# Don't pre-strip, bug 235026
@@ -73,7 +71,7 @@ src_prepare() {
echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
done
- qt4-build_src_prepare
+ qt4-build-multilib_src_prepare
# bug 172219
sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
@@ -103,7 +101,7 @@ src_configure() {
$(use ssl && echo -openssl-linked || echo -no-openssl)
$(qt_use qt3support)"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
src_install() {
@@ -114,8 +112,8 @@ src_install() {
emake INSTALL_ROOT="${D}" install_mkspecs
# install private headers
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private
- find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} +
+ insinto "${QT4_HEADERDIR#${EPREFIX}}"/QtCore/private
+ find "${S}"/src/corelib -type f -name "*_p.h" -exec doins '{}' +
# use freshly built libraries
local DYLD_FPATH=
@@ -125,7 +123,7 @@ src_install() {
LD_LIBRARY_PATH="${S}/lib" \
"${S}"/bin/lrelease translations/*.ts \
|| die "generating translations failed"
- insinto "${QTTRANSDIR#${EPREFIX}}"
+ insinto "${QT4_TRANSLATIONDIR#${EPREFIX}}"
doins translations/*.qm
setqtenv
@@ -142,32 +140,30 @@ src_install() {
EOF
doenvd "${T}"/44qt4
- dodir "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo
- mv "${D}/${QTDATADIR}"/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \
- || die "failed to move qconfig.pri"
+ dodir "${QT4_DATADIR#${EPREFIX}}"/mkspecs/gentoo
+ mv "${D}${QT4_DATADIR}"/mkspecs/{qconfig.pri,gentoo/} || die
# Framework hacking
if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then
# TODO: do this better
sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
- "${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \
+ "${D}${QT4_LIBDIR}"/QtCore.framework/Headers/qconfig.h \
|| die "sed for qconfig.h failed."
- dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
+ dosym "${QT4_HEADERDIR#${EPREFIX}}"/Gentoo "${QT4_LIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
else
sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
- "${D}${QTHEADERDIR}"/QtCore/qconfig.h \
- "${D}${QTHEADERDIR}"/Qt/qconfig.h \
+ "${D}${QT4_HEADERDIR}"/QtCore/qconfig.h \
+ "${D}${QT4_HEADERDIR}"/Qt/qconfig.h \
|| die "sed for qconfig.h failed"
fi
- QCONFIG_DEFINE="QT_ZLIB"
install_qconfigs
# remove .la files
prune_libtool_files
- keepdir "${QTSYSCONFDIR#${EPREFIX}}"
-
- # Framework magic
+ # framework magic
fix_includes
+
+ keepdir "${QT4_SYSCONFDIR#${EPREFIX}}"
}
diff --git a/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild b/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild
index f2fc13b..cf203e4 100644
--- a/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild
+++ b/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild
@@ -2,22 +2,23 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="The DBus module for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
+
IUSE=""
DEPEND="
~dev-qt/qtcore-${PV}[aqua=,debug=]
- >=sys-apps/dbus-1.2
+ sys-apps/dbus
"
RDEPEND="${DEPEND}"
@@ -26,28 +27,24 @@ PATCHES=(
"${FILESDIR}/${PN}-4.8.4-qdbusconnection-silence-warning.patch"
)
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/dbus
- tools/qdbus/qdbus
- tools/qdbus/qdbusxml2cpp
- tools/qdbus/qdbuscpp2xml"
+QT4_TARGET_DIRECTORIES="
+ src/dbus
+ tools/qdbus/qdbus
+ tools/qdbus/qdbusxml2cpp
+ tools/qdbus/qdbuscpp2xml"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtCore
- include/QtDBus
- include/QtXml
- src/corelib
- src/xml"
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include/QtCore
+ include/QtDBus
+ include/QtXml
+ src/corelib
+ src/xml"
- QCONFIG_ADD="dbus dbus-linked"
- QCONFIG_DEFINE="QT_DBUS"
-
- qt4-build_pkg_setup
-}
+QCONFIG_ADD="dbus dbus-linked"
+QCONFIG_DEFINE="QT_DBUS"
src_configure() {
myconf+=" -dbus-linked"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
index 063b4a7..8b1c7b1 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
@@ -2,17 +2,18 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="The Declarative module for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
fi
+
IUSE="+accessibility qt3support webkit"
DEPEND="
@@ -28,28 +29,27 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/declarative
- src/imports
- src/plugins/qmltooling
- tools/qml
- tools/qmlplugindump"
+QT4_TARGET_DIRECTORIES="
+ src/declarative
+ src/imports
+ src/plugins/qmltooling
+ tools/qml
+ tools/qmlplugindump"
- if use webkit; then
- QT4_TARGET_DIRECTORIES+=" src/3rdparty/webkit/Source/WebKit/qt/declarative"
- fi
+QT4_EXTRACT_DIRECTORIES="
+ include
+ src
+ tools
+ translations"
- QT4_EXTRACT_DIRECTORIES="
- include
- src
- tools
- translations"
+QCONFIG_ADD="declarative"
+QCONFIG_DEFINE="QT_DECLARATIVE"
- QCONFIG_ADD="declarative"
- QCONFIG_DEFINE="QT_DECLARATIVE"
+pkg_setup() {
+ use webkit && QT4_TARGET_DIRECTORIES+="
+ src/3rdparty/webkit/Source/WebKit/qt/declarative"
- qt4-build_pkg_setup
+ qt4-build-multilib_pkg_setup
}
src_configure() {
@@ -58,19 +58,19 @@ src_configure() {
$(qt_use accessibility)
$(qt_use qt3support)
$(qt_use webkit)"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
src_install() {
- qt4-build_src_install
+ qt4-build-multilib_src_install
# install private headers
if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
- insinto "${QTLIBDIR#${EPREFIX}}"/QtDeclarative.framework/Headers/private
+ insinto "${QT4_LIBDIR#${EPREFIX}}"/QtDeclarative.framework/Headers/private
# ran for the 2nd time, need it for the updated headers
fix_includes
else
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtDeclarative/private
+ insinto "${QT4_HEADERDIR#${EPREFIX}}"/QtDeclarative/private
fi
- find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins {} +
+ find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins '{}' +
}
diff --git a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
index 20344e4..7a57ed4 100644
--- a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
@@ -2,17 +2,18 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="Demonstration module and examples for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos"
fi
+
IUSE="dbus declarative kde multimedia opengl openvg phonon qt3support webkit xmlpatterns"
DEPEND="
@@ -43,21 +44,18 @@ PATCHES=(
"${FILESDIR}/${PN}-4.6-plugandpaint.patch"
)
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- demos
- examples"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- doc/src/images
- include
- src
- tools"
-
- qt4-build_pkg_setup
-}
+QT4_TARGET_DIRECTORIES="
+ demos
+ examples"
+
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ doc/src/images
+ include
+ src
+ tools"
src_prepare() {
- qt4-build_src_prepare
+ qt4-build-multilib_src_prepare
# Array mapping USE flags to subdirs
local flags_subdirs_map=(
@@ -105,12 +103,12 @@ src_configure() {
$(qt_use webkit)
$(qt_use xmlpatterns)"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
src_install() {
- insinto "${QTDOCDIR#${EPREFIX}}"/src
+ insinto "${QT4_DOCDIR#${EPREFIX}}"/src
doins -r doc/src/images
- qt4-build_src_install
+ qt4-build-multilib_src_install
}
diff --git a/dev-qt/qtgui/qtgui-4.8.9999.ebuild b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
index 25e758b..2f90936 100644
--- a/dev-qt/qtgui/qtgui-4.8.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
@@ -4,10 +4,10 @@
EAPI=5
-inherit eutils qt4-build
+inherit eutils qt4-build-multilib
DESCRIPTION="The GUI module for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
@@ -69,20 +69,16 @@ PATCHES=(
"${FILESDIR}/${PN}-4.7.3-cups.patch"
)
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/gui
- src/scripttools
- src/plugins/imageformats/gif
- src/plugins/imageformats/ico
- src/plugins/imageformats/jpeg
- src/plugins/imageformats/tga
- src/plugins/inputmethods"
-
- QT4_EXTRACT_DIRECTORIES="
- include
- src"
+QT4_TARGET_DIRECTORIES="
+ src/gui
+ src/scripttools
+ src/plugins/imageformats/gif
+ src/plugins/imageformats/ico
+ src/plugins/imageformats/jpeg
+ src/plugins/imageformats/tga
+ src/plugins/inputmethods"
+pkg_setup() {
use accessibility && QT4_TARGET_DIRECTORIES+=" src/plugins/accessible/widgets"
use mng && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/mng"
use tiff && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/tiff"
@@ -91,13 +87,15 @@ pkg_setup() {
# mac version does not contain qtconfig?
[[ ${CHOST} == *-darwin* ]] || QT4_TARGET_DIRECTORIES+=" tools/qtconfig"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
+ QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include
+ src"
- qt4-build_pkg_setup
+ qt4-build-multilib_pkg_setup
}
src_prepare() {
- qt4-build_src_prepare
+ qt4-build-multilib_src_prepare
# Add -xvideo to the list of accepted configure options
sed -i -e 's:|-xinerama|:&-xvideo|:' configure
@@ -123,9 +121,10 @@ src_configure() {
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
- [[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3" #367045
+ # bug 367045
+ [[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
if use gtkstyle; then
sed -i -e 's:-I/usr/include/qt4 ::' src/gui/Makefile || die "sed failed"
@@ -162,15 +161,15 @@ src_install() {
QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC
$(use xv && echo QT_XVIDEO)"
- qt4-build_src_install
+ qt4-build-multilib_src_install
# install private headers
if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
- insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/
+ insinto "${QT4_LIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/
else
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private
+ insinto "${QT4_HEADERDIR#${EPREFIX}}"/QtGui/private
fi
- find "${S}"/src/gui -type f -name '*_p.h' -exec doins {} +
+ find "${S}"/src/gui -type f -name '*_p.h' -exec doins '{}' +
if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
# rerun to get links to headers right
@@ -187,7 +186,7 @@ src_install() {
# bug 388551
if use gtkstyle; then
- local tempfile=${T}/${PN}${SLOT}.sh
+ local tempfile=${T}/${PN}4.sh
cat <<-EOF > "${tempfile}"
export GTK2_RC_FILES=\${HOME}/.gtkrc-2.0
EOF
@@ -197,7 +196,7 @@ src_install() {
}
pkg_postinst() {
- qt4-build_pkg_postinst
+ qt4-build-multilib_pkg_postinst
# raster is the default graphicssystem, set it on first install
eselect qtgraphicssystem set raster --use-old
diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
index 5eebfea..3e4ec00 100644
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit eutils qt4-build
+inherit qt4-build-multilib
DESCRIPTION="The Help module for the Qt toolkit"
SRC_URI+="
@@ -13,7 +13,6 @@ SRC_URI+="
http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz
)"
-SLOT="4"
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
@@ -33,31 +32,32 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- tools/assistant/lib/fulltextsearch
- tools/assistant/lib
- tools/assistant/tools/qhelpgenerator
- tools/assistant/tools/qcollectiongenerator
- tools/assistant/tools/qhelpconverter
- tools/qdoc3"
- QT4_EXTRACT_DIRECTORIES="
- demos
- doc
- examples
- include
- src
- tools"
+QT4_TARGET_DIRECTORIES="
+ tools/assistant/lib/fulltextsearch
+ tools/assistant/lib
+ tools/assistant/tools/qhelpgenerator
+ tools/assistant/tools/qcollectiongenerator
+ tools/assistant/tools/qhelpconverter
+ tools/qdoc3"
+
+QT4_EXTRACT_DIRECTORIES="
+ demos
+ doc
+ examples
+ include
+ src
+ tools"
+pkg_setup() {
use compat && QT4_TARGET_DIRECTORIES+="
tools/assistant/compat
tools/assistant/compat/lib"
- qt4-build_pkg_setup
+ qt4-build-multilib_pkg_setup
}
src_unpack() {
- qt4-build_src_unpack
+ qt4-build-multilib_src_unpack
# compat version
# http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
@@ -71,9 +71,9 @@ src_unpack() {
}
src_prepare() {
- qt4-build_src_prepare
+ use compat && PATCHES+=("${FILESDIR}/${PN}-4.8.5-fix-compat.patch")
- use compat && epatch "${FILESDIR}"/${PN}-4.8.5-fix-compat.patch
+ qt4-build-multilib_src_prepare
# bug 348034
sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
@@ -87,18 +87,18 @@ src_configure() {
-no-multimedia -no-opengl -no-phonon -no-qt3support -no-svg -no-webkit -no-xmlpatterns
-no-nas-sound -no-cups -no-nis -fontconfig"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
src_compile() {
# help libQtHelp find freshly built libQtCLucene (bug #289811)
- export LD_LIBRARY_PATH="${S}/lib:${QTLIBDIR}"
+ export LD_LIBRARY_PATH="${S}/lib:${QT4_LIBDIR}"
export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework"
- qt4-build_src_compile
+ qt4-build-multilib_src_compile
# ugly hack to build docs
- "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die
+ "${S}"/bin/qmake "LIBS+=-L${QT4_LIBDIR}" "CONFIG+=nostrip" || die
if use doc; then
emake docs
@@ -109,19 +109,19 @@ src_compile() {
}
src_install() {
- qt4-build_src_install
+ qt4-build-multilib_src_install
emake INSTALL_ROOT="${D}" install_qchdocs
# do not compress .qch files
- docompress -x "${QTDOCDIR}"/qch
+ docompress -x "${QT4_DOCDIR}"/qch
if use doc; then
emake INSTALL_ROOT="${D}" install_htmldocs
fi
if use compat; then
- insinto "${QTDATADIR#${EPREFIX}}"/mkspecs/features
+ insinto "${QT4_DATADIR#${EPREFIX}}"/mkspecs/features
doins tools/assistant/compat/features/assistant.prf
fi
}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild
index ad39ced..4e74b56 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild
@@ -2,17 +2,18 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="The Multimedia module for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
fi
+
IUSE="alsa"
DEPEND="
@@ -26,24 +27,20 @@ PATCHES=(
"${FILESDIR}/${PN}-4.8.0-alsa.patch"
)
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/multimedia"
+QT4_TARGET_DIRECTORIES="
+ src/multimedia"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/Qt
- include/QtCore
- include/QtGui
- include/QtMultimedia
- src/src.pro
- src/corelib
- src/gui"
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include/Qt
+ include/QtCore
+ include/QtGui
+ include/QtMultimedia
+ src/src.pro
+ src/corelib
+ src/gui"
- QCONFIG_ADD="multimedia"
- QCONFIG_DEFINE="QT_MULTIMEDIA"
-
- qt4-build_pkg_setup
-}
+QCONFIG_ADD="multimedia"
+QCONFIG_DEFINE="QT_MULTIMEDIA"
src_configure() {
myconf+="
@@ -56,5 +53,5 @@ src_configure() {
-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
diff --git a/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild b/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild
index a33d904..11b887b 100644
--- a/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild
+++ b/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild
@@ -2,17 +2,18 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="The OpenGL module for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
+
IUSE="egl qt3support"
DEPEND="
@@ -24,26 +25,22 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/opengl
- src/plugins/graphicssystems/opengl"
+QT4_TARGET_DIRECTORIES="
+ src/opengl
+ src/plugins/graphicssystems/opengl"
- QT4_EXTRACT_DIRECTORIES="
- include/QtCore
- include/QtGui
- include/QtOpenGL
- src/corelib
- src/gui
- src/opengl
- src/plugins
- src/3rdparty"
+QT4_EXTRACT_DIRECTORIES="
+ include/QtCore
+ include/QtGui
+ include/QtOpenGL
+ src/corelib
+ src/gui
+ src/opengl
+ src/plugins
+ src/3rdparty"
- QCONFIG_ADD="opengl"
- QCONFIG_DEFINE="QT_OPENGL"
-
- qt4-build_pkg_setup
-}
+QCONFIG_ADD="opengl"
+QCONFIG_DEFINE="QT_OPENGL"
src_configure() {
myconf+="
@@ -51,14 +48,11 @@ src_configure() {
$(qt_use qt3support)
$(qt_use egl)"
- qt4-build_src_configure
-
- # Not building tools/designer/src/plugins/tools/view3d as it's
- # commented out of the build in the source
+ qt4-build-multilib_src_configure
}
src_install() {
- qt4-build_src_install
+ qt4-build-multilib_src_install
# touch the available graphics systems
dodir /usr/share/qt4/graphicssystems
diff --git a/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild b/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild
index 2e54c08..e11f3af 100644
--- a/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild
+++ b/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild
@@ -2,17 +2,18 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="The OpenVG module for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
+
IUSE="qt3support"
DEPEND="
@@ -22,39 +23,33 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/openvg
- src/plugins/graphicssystems/openvg"
-
- QT4_EXTRACT_DIRECTORIES="
- include/QtCore
- include/QtGui
- include/QtOpenVG
- src/corelib
- src/gui
- src/openvg
- src/plugins
- src/3rdparty"
-
- QCONFIG_ADD="openvg"
- QCONFIG_DEFINE="QT_OPENVG"
-
- qt4-build_pkg_setup
-}
+QT4_TARGET_DIRECTORIES="
+ src/openvg
+ src/plugins/graphicssystems/openvg"
-src_configure() {
- gltype="desktop"
+QT4_EXTRACT_DIRECTORIES="
+ include/QtCore
+ include/QtGui
+ include/QtOpenVG
+ src/corelib
+ src/gui
+ src/openvg
+ src/plugins
+ src/3rdparty"
+
+QCONFIG_ADD="openvg"
+QCONFIG_DEFINE="QT_OPENVG"
+src_configure() {
myconf+="
-openvg -egl
$(qt_use qt3support)"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
src_install() {
- qt4-build_src_install
+ qt4-build-multilib_src_install
# touch the available graphics systems
dodir /usr/share/qt4/graphicssystems
diff --git a/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild b/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
index c155f65..55db6be 100644
--- a/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
+++ b/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
@@ -2,53 +2,59 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="The Phonon module for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
+
IUSE="dbus qt3support"
DEPEND="
+ ~dev-qt/qtcore-${PV}[aqua=,debug=]
~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support=]
!kde-base/phonon-kde
!kde-base/phonon-xine
!media-libs/phonon
!media-sound/phonon
- !aqua? ( media-libs/gstreamer:0.10
- media-plugins/gst-plugins-meta:0.10 )
aqua? ( ~dev-qt/qtopengl-${PV}[aqua,debug=,qt3support=] )
+ !aqua? (
+ media-libs/gstreamer:0.10
+ media-plugins/gst-plugins-meta:0.10
+ )
dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/phonon
- src/plugins/phonon"
+QT4_TARGET_DIRECTORIES="
+ src/phonon
+ src/plugins/phonon"
- QT4_EXTRACT_DIRECTORIES="
- include
- src"
+QT4_EXTRACT_DIRECTORIES="
+ include
+ src"
- QCONFIG_ADD="phonon"
+QCONFIG_ADD="phonon"
+
+pkg_setup() {
QCONFIG_DEFINE="QT_PHONON
- $(use !aqua && echo QT_GSTREAMER)"
+ $(use aqua || echo QT_GSTREAMER)"
- qt4-build_pkg_setup
+ qt4-build-multilib_pkg_setup
}
src_configure() {
myconf+="
- -phonon -phonon-backend -no-opengl -no-svg
+ -phonon -phonon-backend
+ -no-opengl -no-svg
$(qt_use dbus qdbus)
$(qt_use qt3support)"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
diff --git a/dev-qt/qtscript/qtscript-4.8.9999.ebuild b/dev-qt/qtscript/qtscript-4.8.9999.ebuild
index bb97692..f6796ce 100644
--- a/dev-qt/qtscript/qtscript-4.8.9999.ebuild
+++ b/dev-qt/qtscript/qtscript-4.8.9999.ebuild
@@ -2,17 +2,18 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="The QtScript module for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
+
IUSE="iconv +jit"
DEPEND="
@@ -20,22 +21,18 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/script"
+QT4_TARGET_DIRECTORIES="
+ src/script"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/Qt
- include/QtCore
- include/QtScript
- src/3rdparty/javascriptcore
- src/corelib"
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include/Qt
+ include/QtCore
+ include/QtScript
+ src/3rdparty/javascriptcore
+ src/corelib"
- QCONFIG_ADD="script"
- QCONFIG_DEFINE="QT_SCRIPT"
-
- qt4-build_pkg_setup
-}
+QCONFIG_ADD="script"
+QCONFIG_DEFINE="QT_SCRIPT"
src_configure() {
myconf+="
@@ -48,13 +45,13 @@ src_configure() {
-no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg
-no-gtkstyle"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
src_install() {
- qt4-build_src_install
+ qt4-build-multilib_src_install
# install private headers
- insinto "${QTHEADERDIR#${EPREFIX}}"/QtScript/private
- find "${S}"/src/script -type f -name "*_p.h" -exec doins {} +
+ insinto "${QT4_HEADERDIR#${EPREFIX}}"/QtScript/private
+ find "${S}"/src/script -type f -name "*_p.h" -exec doins '{}' +
}
diff --git a/dev-qt/qtsql/qtsql-4.8.9999.ebuild b/dev-qt/qtsql/qtsql-4.8.9999.ebuild
index af6cd63..e3fe7c7 100644
--- a/dev-qt/qtsql/qtsql-4.8.9999.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.9999.ebuild
@@ -2,17 +2,18 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit multilib qt4-build
+inherit multilib qt4-build-multilib
DESCRIPTION="The SQL module for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
+
IUSE="firebird freetds mysql oci8 odbc postgres qt3support +sqlite"
REQUIRED_USE="
@@ -31,22 +32,18 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/sql
- src/plugins/sqldrivers"
+QT4_TARGET_DIRECTORIES="
+ src/sql
+ src/plugins/sqldrivers"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/Qt
- include/QtCore
- include/QtSql
- src/src.pro
- src/corelib
- src/plugins
- src/tools/tools.pro"
-
- qt4-build_pkg_setup
-}
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include/Qt
+ include/QtCore
+ include/QtSql
+ src/src.pro
+ src/corelib
+ src/plugins
+ src/tools/tools.pro"
src_configure() {
myconf+="
@@ -69,5 +66,5 @@ src_configure() {
-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
-no-glib"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
diff --git a/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild b/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild
index ab4668e..6e4baef 100644
--- a/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild
+++ b/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild
@@ -2,17 +2,18 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="The SVG module for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
+
IUSE="+accessibility"
DEPEND="
@@ -22,29 +23,25 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/svg
- src/plugins/imageformats/svg
- src/plugins/iconengines/svgiconengine"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtSvg
- include/Qt
- include/QtGui
- include/QtCore
- include/QtXml
- src/corelib
- src/gui
- src/plugins
- src/xml
- src/3rdparty"
-
- QCONFIG_ADD="svg"
- QCONFIG_DEFINE="QT_SVG"
-
- qt4-build_pkg_setup
-}
+QT4_TARGET_DIRECTORIES="
+ src/svg
+ src/plugins/imageformats/svg
+ src/plugins/iconengines/svgiconengine"
+
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include/QtSvg
+ include/Qt
+ include/QtGui
+ include/QtCore
+ include/QtXml
+ src/corelib
+ src/gui
+ src/plugins
+ src/xml
+ src/3rdparty"
+
+QCONFIG_ADD="svg"
+QCONFIG_DEFINE="QT_SVG"
src_configure() {
myconf+="
@@ -57,5 +54,5 @@ src_configure() {
-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
-no-fontconfig -no-glib -no-gtkstyle"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
diff --git a/dev-qt/qttest/qttest-4.8.9999.ebuild b/dev-qt/qttest/qttest-4.8.9999.ebuild
index 7256324..a0292cb 100644
--- a/dev-qt/qttest/qttest-4.8.9999.ebuild
+++ b/dev-qt/qttest/qttest-4.8.9999.ebuild
@@ -2,17 +2,18 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="The QtTest module for unit testing Qt applications and libraries"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
+
IUSE=""
DEPEND="
@@ -20,17 +21,13 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/testlib"
+QT4_TARGET_DIRECTORIES="
+ src/testlib"
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtTest
- include/QtCore
- src/corelib"
-
- qt4-build_pkg_setup
-}
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include/QtTest
+ include/QtCore
+ src/corelib"
src_configure() {
myconf+="
@@ -41,5 +38,5 @@ src_configure() {
-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
-no-accessibility -no-fontconfig -no-glib -no-svg"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
index a87fc07..eb66856 100644
--- a/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
@@ -4,15 +4,16 @@
EAPI=5
-inherit qt4-build flag-o-matic
+inherit qt4-build-multilib
DESCRIPTION="The WebKit module for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
+
IUSE="+gstreamer icu +jit"
# libxml2[!icu?] is needed for bugs 407315 and 411091
@@ -38,21 +39,17 @@ PATCHES=(
"${FILESDIR}/4.8.2-javascriptcore-x32.patch"
)
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/3rdparty/webkit/Source/JavaScriptCore
- src/3rdparty/webkit/Source/WebCore
- src/3rdparty/webkit/Source/WebKit/qt"
+QT4_TARGET_DIRECTORIES="
+ src/3rdparty/webkit/Source/JavaScriptCore
+ src/3rdparty/webkit/Source/WebCore
+ src/3rdparty/webkit/Source/WebKit/qt"
- QT4_EXTRACT_DIRECTORIES="
- include
- src"
+QT4_EXTRACT_DIRECTORIES="
+ include
+ src"
- QCONFIG_ADD="webkit"
- QCONFIG_DEFINE="QT_WEBKIT"
-
- qt4-build_pkg_setup
-}
+QCONFIG_ADD="webkit"
+QCONFIG_DEFINE="QT_WEBKIT"
src_prepare() {
# Fix version number in generated pkgconfig file, bug 406443
@@ -68,7 +65,7 @@ src_prepare() {
src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die
fi
- qt4-build_src_prepare
+ qt4-build-multilib_src_prepare
}
src_configure() {
@@ -79,5 +76,5 @@ src_configure() {
$(qt_use jit javascript-jit)
$(use gstreamer || echo -DENABLE_VIDEO=0)"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild
index 575c99f..9f6a15b 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild
@@ -2,17 +2,18 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
-inherit qt4-build
+inherit qt4-build-multilib
DESCRIPTION="The XmlPatterns module for the Qt toolkit"
-SLOT="4"
+
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
+
IUSE=""
DEPEND="
@@ -20,29 +21,25 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-pkg_setup() {
- QT4_TARGET_DIRECTORIES="
- src/xmlpatterns
- tools/xmlpatterns
- tools/xmlpatternsvalidator"
-
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
- include/QtCore
- include/QtNetwork
- include/QtXml
- include/QtXmlPatterns
- src/network
- src/xml
- src/corelib"
-
- QCONFIG_ADD="xmlpatterns"
- QCONFIG_DEFINE="QT_XMLPATTERNS"
-
- qt4-build_pkg_setup
-}
+QT4_TARGET_DIRECTORIES="
+ src/xmlpatterns
+ tools/xmlpatterns
+ tools/xmlpatternsvalidator"
+
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+ include/QtCore
+ include/QtNetwork
+ include/QtXml
+ include/QtXmlPatterns
+ src/network
+ src/xml
+ src/corelib"
+
+QCONFIG_ADD="xmlpatterns"
+QCONFIG_DEFINE="QT_XMLPATTERNS"
src_configure() {
myconf+=" -xmlpatterns"
- qt4-build_src_configure
+ qt4-build-multilib_src_configure
}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qttest/, dev-qt/pixeltool/, dev-qt/qtmultimedia/, dev-qt/qdbusviewer/, ...
@ 2014-06-02 18:44 Davide Pesavento
0 siblings, 0 replies; 4+ messages in thread
From: Davide Pesavento @ 2014-06-02 18:44 UTC (permalink / raw
To: gentoo-commits
commit: c257170e0c37c3a6fa3874dda7b650b1d2af8297
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 2 18:43:58 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jun 2 18:43:58 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c257170e
[Qt4] Add MULTILIB_USEDEP where appropriate.
---
dev-qt/assistant/assistant-4.8.6.ebuild | 10 ++--
dev-qt/assistant/assistant-4.8.9999.ebuild | 10 ++--
dev-qt/designer/designer-4.8.6.ebuild | 14 ++---
dev-qt/designer/designer-4.8.9999.ebuild | 14 ++---
dev-qt/linguist/linguist-4.8.6.ebuild | 6 +-
dev-qt/linguist/linguist-4.8.9999.ebuild | 6 +-
dev-qt/pixeltool/pixeltool-4.8.6.ebuild | 4 +-
dev-qt/pixeltool/pixeltool-4.8.9999.ebuild | 4 +-
dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild | 6 +-
dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild | 6 +-
dev-qt/qt3support/qt3support-4.8.6.ebuild | 6 +-
dev-qt/qt3support/qt3support-4.8.9999.ebuild | 6 +-
dev-qt/qtbearer/qtbearer-4.8.6.ebuild | 6 +-
dev-qt/qtbearer/qtbearer-4.8.9999.ebuild | 6 +-
dev-qt/qtcore/qtcore-4.8.6.ebuild | 10 ++--
dev-qt/qtcore/qtcore-4.8.9999.ebuild | 10 ++--
dev-qt/qtdbus/qtdbus-4.8.6.ebuild | 4 +-
dev-qt/qtdbus/qtdbus-4.8.9999.ebuild | 4 +-
dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild | 18 +++---
dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild | 18 +++---
dev-qt/qtdemo/qtdemo-4.8.6.ebuild | 32 +++++------
dev-qt/qtdemo/qtdemo-4.8.9999.ebuild | 32 +++++------
dev-qt/qtgui/qtgui-4.8.6.ebuild | 64 +++++++++++-----------
dev-qt/qtgui/qtgui-4.8.9999.ebuild | 64 +++++++++++-----------
dev-qt/qthelp/qthelp-4.8.6.ebuild | 10 ++--
dev-qt/qthelp/qthelp-4.8.9999.ebuild | 10 ++--
dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild | 6 +-
dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild | 6 +-
dev-qt/qtopengl/qtopengl-4.8.6.ebuild | 10 ++--
dev-qt/qtopengl/qtopengl-4.8.9999.ebuild | 10 ++--
dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild | 6 +-
dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild | 6 +-
dev-qt/qtphonon/qtphonon-4.8.6.ebuild | 16 +++---
dev-qt/qtphonon/qtphonon-4.8.9999.ebuild | 16 +++---
dev-qt/qtscript/qtscript-4.8.6.ebuild | 2 +-
dev-qt/qtscript/qtscript-4.8.9999.ebuild | 2 +-
dev-qt/qtsql/qtsql-4.8.6.ebuild | 8 +--
dev-qt/qtsql/qtsql-4.8.9999.ebuild | 8 +--
dev-qt/qtsvg/qtsvg-4.8.6.ebuild | 6 +-
dev-qt/qtsvg/qtsvg-4.8.9999.ebuild | 6 +-
dev-qt/qttest/qttest-4.8.6.ebuild | 2 +-
dev-qt/qttest/qttest-4.8.9999.ebuild | 2 +-
dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild | 18 +++---
dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild | 18 +++---
dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild | 2 +-
dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild | 2 +-
46 files changed, 268 insertions(+), 264 deletions(-)
diff --git a/dev-qt/assistant/assistant-4.8.6.ebuild b/dev-qt/assistant/assistant-4.8.6.ebuild
index 0a54ca0..60846fa 100644
--- a/dev-qt/assistant/assistant-4.8.6.ebuild
+++ b/dev-qt/assistant/assistant-4.8.6.ebuild
@@ -17,11 +17,11 @@ fi
IUSE="webkit"
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=]
- ~dev-qt/qthelp-${PV}[aqua=,debug=]
- ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite]
- webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qthelp-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}]
+ webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/assistant/assistant-4.8.9999.ebuild b/dev-qt/assistant/assistant-4.8.9999.ebuild
index 0a54ca0..60846fa 100644
--- a/dev-qt/assistant/assistant-4.8.9999.ebuild
+++ b/dev-qt/assistant/assistant-4.8.9999.ebuild
@@ -17,11 +17,11 @@ fi
IUSE="webkit"
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=]
- ~dev-qt/qthelp-${PV}[aqua=,debug=]
- ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite]
- webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qthelp-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}]
+ webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/designer/designer-4.8.6.ebuild b/dev-qt/designer/designer-4.8.6.ebuild
index 5ae0273..0b0d858 100644
--- a/dev-qt/designer/designer-4.8.6.ebuild
+++ b/dev-qt/designer/designer-4.8.6.ebuild
@@ -18,13 +18,13 @@ DESIGNER_PLUGINS="declarative phonon qt3support webkit"
IUSE="${DESIGNER_PLUGINS}"
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=]
- ~dev-qt/qtscript-${PV}[aqua=,debug=]
- declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=] )
- phonon? ( ~dev-qt/qtphonon-${PV}[aqua=,debug=] )
- qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )
- webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+ phonon? ( ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+ qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+ webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/designer/designer-4.8.9999.ebuild b/dev-qt/designer/designer-4.8.9999.ebuild
index 5ae0273..0b0d858 100644
--- a/dev-qt/designer/designer-4.8.9999.ebuild
+++ b/dev-qt/designer/designer-4.8.9999.ebuild
@@ -18,13 +18,13 @@ DESIGNER_PLUGINS="declarative phonon qt3support webkit"
IUSE="${DESIGNER_PLUGINS}"
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=]
- ~dev-qt/qtscript-${PV}[aqua=,debug=]
- declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=] )
- phonon? ( ~dev-qt/qtphonon-${PV}[aqua=,debug=] )
- qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )
- webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+ phonon? ( ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+ qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+ webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/linguist/linguist-4.8.6.ebuild b/dev-qt/linguist/linguist-4.8.6.ebuild
index 606e0af..62bfacf 100644
--- a/dev-qt/linguist/linguist-4.8.6.ebuild
+++ b/dev-qt/linguist/linguist-4.8.6.ebuild
@@ -17,9 +17,9 @@ fi
IUSE=""
DEPEND="
- ~dev-qt/designer-${PV}[aqua=,debug=]
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=]
+ ~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/linguist/linguist-4.8.9999.ebuild b/dev-qt/linguist/linguist-4.8.9999.ebuild
index 606e0af..62bfacf 100644
--- a/dev-qt/linguist/linguist-4.8.9999.ebuild
+++ b/dev-qt/linguist/linguist-4.8.9999.ebuild
@@ -17,9 +17,9 @@ fi
IUSE=""
DEPEND="
- ~dev-qt/designer-${PV}[aqua=,debug=]
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=]
+ ~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/pixeltool/pixeltool-4.8.6.ebuild b/dev-qt/pixeltool/pixeltool-4.8.6.ebuild
index b61f5ed..07cf48b 100644
--- a/dev-qt/pixeltool/pixeltool-4.8.6.ebuild
+++ b/dev-qt/pixeltool/pixeltool-4.8.6.ebuild
@@ -17,8 +17,8 @@ fi
IUSE=""
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=]
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
!<dev-qt/qthelp-4.8.5:4
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild b/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild
index b61f5ed..07cf48b 100644
--- a/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild
+++ b/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild
@@ -17,8 +17,8 @@ fi
IUSE=""
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=]
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
!<dev-qt/qthelp-4.8.5:4
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild
index 303fc8d..fe83d4c 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild
@@ -17,9 +17,9 @@ fi
IUSE=""
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- ~dev-qt/qtdbus-${PV}[aqua=,debug=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=]
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild
index 303fc8d..fe83d4c 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild
@@ -17,9 +17,9 @@ fi
IUSE=""
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- ~dev-qt/qtdbus-${PV}[aqua=,debug=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=]
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qt3support/qt3support-4.8.6.ebuild b/dev-qt/qt3support/qt3support-4.8.6.ebuild
index 191103e..ab38a26 100644
--- a/dev-qt/qt3support/qt3support-4.8.6.ebuild
+++ b/dev-qt/qt3support/qt3support-4.8.6.ebuild
@@ -17,9 +17,9 @@ fi
IUSE="+accessibility"
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support]
- ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support]
- ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support]
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
+ ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qt3support/qt3support-4.8.9999.ebuild b/dev-qt/qt3support/qt3support-4.8.9999.ebuild
index 191103e..ab38a26 100644
--- a/dev-qt/qt3support/qt3support-4.8.9999.ebuild
+++ b/dev-qt/qt3support/qt3support-4.8.9999.ebuild
@@ -17,9 +17,9 @@ fi
IUSE="+accessibility"
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support]
- ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support]
- ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support]
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
+ ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support,${MULTILIB_USEDEP}]
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtbearer/qtbearer-4.8.6.ebuild b/dev-qt/qtbearer/qtbearer-4.8.6.ebuild
index d5c7eb1..bb01c0a 100644
--- a/dev-qt/qtbearer/qtbearer-4.8.6.ebuild
+++ b/dev-qt/qtbearer/qtbearer-4.8.6.ebuild
@@ -17,9 +17,9 @@ fi
IUSE="connman networkmanager"
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- connman? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
- networkmanager? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ connman? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+ networkmanager? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
"
RDEPEND="${DEPEND}
connman? ( net-misc/connman )
diff --git a/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild b/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
index d5c7eb1..bb01c0a 100644
--- a/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
+++ b/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
@@ -17,9 +17,9 @@ fi
IUSE="connman networkmanager"
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- connman? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
- networkmanager? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ connman? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+ networkmanager? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
"
RDEPEND="${DEPEND}
connman? ( net-misc/connman )
diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild b/dev-qt/qtcore/qtcore-4.8.6.ebuild
index 60bff0a..783bbdb 100644
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild
@@ -17,15 +17,15 @@ fi
IUSE="+glib iconv icu qt3support ssl"
DEPEND="
- sys-libs/zlib
- glib? ( dev-libs/glib:2 )
- icu? ( dev-libs/icu:= )
- ssl? ( dev-libs/openssl:0 )
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+ icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
+ ssl? ( dev-libs/openssl:0[${MULTILIB_USEDEP}] )
"
RDEPEND="${DEPEND}"
PDEPEND="
~dev-qt/qttranslations-${PV}
- qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support] )
+ qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support,${MULTILIB_USEDEP}] )
"
PATCHES=(
diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index 60bff0a..783bbdb 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -17,15 +17,15 @@ fi
IUSE="+glib iconv icu qt3support ssl"
DEPEND="
- sys-libs/zlib
- glib? ( dev-libs/glib:2 )
- icu? ( dev-libs/icu:= )
- ssl? ( dev-libs/openssl:0 )
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+ icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
+ ssl? ( dev-libs/openssl:0[${MULTILIB_USEDEP}] )
"
RDEPEND="${DEPEND}"
PDEPEND="
~dev-qt/qttranslations-${PV}
- qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support] )
+ qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support,${MULTILIB_USEDEP}] )
"
PATCHES=(
diff --git a/dev-qt/qtdbus/qtdbus-4.8.6.ebuild b/dev-qt/qtdbus/qtdbus-4.8.6.ebuild
index d4fcbde..df916b8 100644
--- a/dev-qt/qtdbus/qtdbus-4.8.6.ebuild
+++ b/dev-qt/qtdbus/qtdbus-4.8.6.ebuild
@@ -17,8 +17,8 @@ fi
IUSE=""
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- sys-apps/dbus
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ sys-apps/dbus[${MULTILIB_USEDEP}]
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild b/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild
index d4fcbde..df916b8 100644
--- a/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild
+++ b/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild
@@ -17,8 +17,8 @@ fi
IUSE=""
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- sys-apps/dbus
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ sys-apps/dbus[${MULTILIB_USEDEP}]
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild
index 3247b62..5a5c974 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild
@@ -17,15 +17,15 @@ fi
IUSE="+accessibility qt3support webkit"
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=]
- ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support=]
- ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=]
- ~dev-qt/qtscript-${PV}[aqua=,debug=]
- ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support=]
- ~dev-qt/qtsvg-${PV}[accessibility=,aqua=,debug=]
- ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=]
- qt3support? ( ~dev-qt/qt3support-${PV}[accessibility=,aqua=,debug=] )
- webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtsvg-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ qt3support? ( ~dev-qt/qt3support-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}] )
+ webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
index 3247b62..5a5c974 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
@@ -17,15 +17,15 @@ fi
IUSE="+accessibility qt3support webkit"
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=]
- ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support=]
- ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=]
- ~dev-qt/qtscript-${PV}[aqua=,debug=]
- ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support=]
- ~dev-qt/qtsvg-${PV}[accessibility=,aqua=,debug=]
- ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=]
- qt3support? ( ~dev-qt/qt3support-${PV}[accessibility=,aqua=,debug=] )
- webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtsvg-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ qt3support? ( ~dev-qt/qt3support-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}] )
+ webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtdemo/qtdemo-4.8.6.ebuild b/dev-qt/qtdemo/qtdemo-4.8.6.ebuild
index 50072f8..e74659d 100644
--- a/dev-qt/qtdemo/qtdemo-4.8.6.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.6.ebuild
@@ -17,25 +17,25 @@ fi
IUSE="dbus declarative kde multimedia opengl openvg phonon webkit xmlpatterns"
DEPEND="
- ~dev-qt/designer-${PV}[aqua=,debug=]
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=]
- ~dev-qt/qthelp-${PV}[aqua=,debug=]
- ~dev-qt/qtscript-${PV}[aqua=,debug=]
- ~dev-qt/qtsql-${PV}[aqua=,debug=]
- ~dev-qt/qtsvg-${PV}[aqua=,debug=]
- ~dev-qt/qttest-${PV}[aqua=,debug=]
- dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
- declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?] )
- multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=] )
- opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=] )
- openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=] )
+ ~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qthelp-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtsql-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtsvg-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qttest-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+ declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?,${MULTILIB_USEDEP}] )
+ multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+ opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+ openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
phonon? (
kde? ( media-libs/phonon[aqua=] )
- !kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=] media-libs/phonon[aqua=] ) )
+ !kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] media-libs/phonon[aqua=] ) )
)
- webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
- xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=] )
+ webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+ xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
index 50072f8..e74659d 100644
--- a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
@@ -17,25 +17,25 @@ fi
IUSE="dbus declarative kde multimedia opengl openvg phonon webkit xmlpatterns"
DEPEND="
- ~dev-qt/designer-${PV}[aqua=,debug=]
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=]
- ~dev-qt/qthelp-${PV}[aqua=,debug=]
- ~dev-qt/qtscript-${PV}[aqua=,debug=]
- ~dev-qt/qtsql-${PV}[aqua=,debug=]
- ~dev-qt/qtsvg-${PV}[aqua=,debug=]
- ~dev-qt/qttest-${PV}[aqua=,debug=]
- dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
- declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?] )
- multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=] )
- opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=] )
- openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=] )
+ ~dev-qt/designer-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qthelp-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtsql-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtsvg-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qttest-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+ declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?,${MULTILIB_USEDEP}] )
+ multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+ opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+ openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
phonon? (
kde? ( media-libs/phonon[aqua=] )
- !kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=] media-libs/phonon[aqua=] ) )
+ !kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] media-libs/phonon[aqua=] ) )
)
- webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
- xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=] )
+ webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+ xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtgui/qtgui-4.8.6.ebuild b/dev-qt/qtgui/qtgui-4.8.6.ebuild
index 8191652..9adb751 100644
--- a/dev-qt/qtgui/qtgui-4.8.6.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.6.ebuild
@@ -23,47 +23,49 @@ REQUIRED_USE="
# cairo[-qt4] is needed because of bug 454066
RDEPEND="
app-admin/eselect-qtgraphicssystem
- ~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=]
- ~dev-qt/qtscript-${PV}[aqua=,debug=]
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/libpng:0=
- sys-libs/zlib
- virtual/jpeg:0
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ media-libs/fontconfig[${MULTILIB_USEDEP}]
+ media-libs/freetype:2[${MULTILIB_USEDEP}]
+ media-libs/libpng:0=[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ virtual/jpeg:0[${MULTILIB_USEDEP}]
!aqua? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- xinerama? ( x11-libs/libXinerama )
- xv? ( x11-libs/libXv )
+ x11-libs/libICE[${MULTILIB_USEDEP}]
+ x11-libs/libSM[${MULTILIB_USEDEP}]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXcursor[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes[${MULTILIB_USEDEP}]
+ x11-libs/libXi[${MULTILIB_USEDEP}]
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-libs/libXrender[${MULTILIB_USEDEP}]
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+ xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
)
- cups? ( net-print/cups )
- egl? ( media-libs/mesa[egl] )
- glib? ( dev-libs/glib:2 )
+ cups? ( net-print/cups[${MULTILIB_USEDEP}] )
+ egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )
+ glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
gtkstyle? (
- x11-libs/cairo[-qt4]
- x11-libs/gtk+:2[aqua=]
+ x11-libs/cairo[-qt4,${MULTILIB_USEDEP}]
+ x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}]
)
- mng? ( >=media-libs/libmng-1.0.9:= )
- nas? ( >=media-libs/nas-1.5 )
- tiff? ( media-libs/tiff:0 )
+ mng? ( >=media-libs/libmng-1.0.9:=[${MULTILIB_USEDEP}] )
+ nas? ( >=media-libs/nas-1.5[${MULTILIB_USEDEP}] )
+ tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
!<dev-qt/qthelp-4.8.5:4
"
DEPEND="${RDEPEND}
!aqua? (
- x11-proto/inputproto
- x11-proto/xextproto
- xinerama? ( x11-proto/xineramaproto )
- xv? ( x11-proto/videoproto )
+ x11-proto/inputproto[${MULTILIB_USEDEP}]
+ x11-proto/xextproto[${MULTILIB_USEDEP}]
+ xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
+ xv? ( x11-proto/videoproto[${MULTILIB_USEDEP}] )
)
"
-PDEPEND="qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )"
+PDEPEND="
+ qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+"
PATCHES=(
"${FILESDIR}/${PN}-4.7.3-cups.patch" # bug 323257
diff --git a/dev-qt/qtgui/qtgui-4.8.9999.ebuild b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
index 288ec37..a97b855 100644
--- a/dev-qt/qtgui/qtgui-4.8.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
@@ -23,47 +23,49 @@ REQUIRED_USE="
# cairo[-qt4] is needed because of bug 454066
RDEPEND="
app-admin/eselect-qtgraphicssystem
- ~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=]
- ~dev-qt/qtscript-${PV}[aqua=,debug=]
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/libpng:0=
- sys-libs/zlib
- virtual/jpeg:0
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ media-libs/fontconfig[${MULTILIB_USEDEP}]
+ media-libs/freetype:2[${MULTILIB_USEDEP}]
+ media-libs/libpng:0=[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ virtual/jpeg:0[${MULTILIB_USEDEP}]
!aqua? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- xinerama? ( x11-libs/libXinerama )
- xv? ( x11-libs/libXv )
+ x11-libs/libICE[${MULTILIB_USEDEP}]
+ x11-libs/libSM[${MULTILIB_USEDEP}]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXcursor[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes[${MULTILIB_USEDEP}]
+ x11-libs/libXi[${MULTILIB_USEDEP}]
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-libs/libXrender[${MULTILIB_USEDEP}]
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+ xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
)
- cups? ( net-print/cups )
- egl? ( media-libs/mesa[egl] )
- glib? ( dev-libs/glib:2 )
+ cups? ( net-print/cups[${MULTILIB_USEDEP}] )
+ egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )
+ glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
gtkstyle? (
- x11-libs/cairo[-qt4]
- x11-libs/gtk+:2[aqua=]
+ x11-libs/cairo[-qt4,${MULTILIB_USEDEP}]
+ x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}]
)
- mng? ( >=media-libs/libmng-1.0.9:= )
- nas? ( >=media-libs/nas-1.5 )
- tiff? ( media-libs/tiff:0 )
+ mng? ( >=media-libs/libmng-1.0.9:=[${MULTILIB_USEDEP}] )
+ nas? ( >=media-libs/nas-1.5[${MULTILIB_USEDEP}] )
+ tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
!<dev-qt/qthelp-4.8.5:4
"
DEPEND="${RDEPEND}
!aqua? (
- x11-proto/inputproto
- x11-proto/xextproto
- xinerama? ( x11-proto/xineramaproto )
- xv? ( x11-proto/videoproto )
+ x11-proto/inputproto[${MULTILIB_USEDEP}]
+ x11-proto/xextproto[${MULTILIB_USEDEP}]
+ xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
+ xv? ( x11-proto/videoproto[${MULTILIB_USEDEP}] )
)
"
-PDEPEND="qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )"
+PDEPEND="
+ qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+"
PATCHES=(
"${FILESDIR}/${PN}-4.7.3-cups.patch" # bug 323257
diff --git a/dev-qt/qthelp/qthelp-4.8.6.ebuild b/dev-qt/qthelp/qthelp-4.8.6.ebuild
index f385329..70ac632 100644
--- a/dev-qt/qthelp/qthelp-4.8.6.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.6.ebuild
@@ -22,12 +22,12 @@ fi
IUSE="compat doc"
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=]
- ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite]
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}]
compat? (
- ~dev-qt/qtdbus-${PV}[aqua=,debug=]
- sys-libs/zlib
+ ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
)
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
index f385329..70ac632 100644
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
@@ -22,12 +22,12 @@ fi
IUSE="compat doc"
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=]
- ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite]
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}]
compat? (
- ~dev-qt/qtdbus-${PV}[aqua=,debug=]
- sys-libs/zlib
+ ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
)
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild
index 897fa0d..32318e3 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild
@@ -17,9 +17,9 @@ fi
IUSE="alsa"
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=]
- alsa? ( media-libs/alsa-lib )
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild
index 897fa0d..32318e3 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild
@@ -17,9 +17,9 @@ fi
IUSE="alsa"
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=]
- alsa? ( media-libs/alsa-lib )
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtopengl/qtopengl-4.8.6.ebuild b/dev-qt/qtopengl/qtopengl-4.8.6.ebuild
index 404909b..8c08988 100644
--- a/dev-qt/qtopengl/qtopengl-4.8.6.ebuild
+++ b/dev-qt/qtopengl/qtopengl-4.8.6.ebuild
@@ -17,11 +17,11 @@ fi
IUSE="egl qt3support"
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=,egl=,qt3support=]
- x11-libs/libX11
- x11-libs/libXrender
- virtual/opengl
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=,egl=,qt3support=,${MULTILIB_USEDEP}]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXrender[${MULTILIB_USEDEP}]
+ virtual/opengl[${MULTILIB_USEDEP}]
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild b/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild
index 404909b..8c08988 100644
--- a/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild
+++ b/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild
@@ -17,11 +17,11 @@ fi
IUSE="egl qt3support"
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=,egl=,qt3support=]
- x11-libs/libX11
- x11-libs/libXrender
- virtual/opengl
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=,egl=,qt3support=,${MULTILIB_USEDEP}]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXrender[${MULTILIB_USEDEP}]
+ virtual/opengl[${MULTILIB_USEDEP}]
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild b/dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild
index 73e2d06..84799f5 100644
--- a/dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild
+++ b/dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild
@@ -17,9 +17,9 @@ fi
IUSE="qt3support"
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=,egl,qt3support=]
- media-libs/mesa[egl,openvg]
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=,egl,qt3support=,${MULTILIB_USEDEP}]
+ media-libs/mesa[egl,openvg,${MULTILIB_USEDEP}]
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild b/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild
index 73e2d06..84799f5 100644
--- a/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild
+++ b/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild
@@ -17,9 +17,9 @@ fi
IUSE="qt3support"
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=,egl,qt3support=]
- media-libs/mesa[egl,openvg]
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=,egl,qt3support=,${MULTILIB_USEDEP}]
+ media-libs/mesa[egl,openvg,${MULTILIB_USEDEP}]
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtphonon/qtphonon-4.8.6.ebuild b/dev-qt/qtphonon/qtphonon-4.8.6.ebuild
index 759970f..fb5979b 100644
--- a/dev-qt/qtphonon/qtphonon-4.8.6.ebuild
+++ b/dev-qt/qtphonon/qtphonon-4.8.6.ebuild
@@ -17,18 +17,18 @@ fi
IUSE="dbus qt3support"
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support=]
- !kde-base/phonon-kde
- !kde-base/phonon-xine
- !media-libs/phonon
- !media-sound/phonon
- aqua? ( ~dev-qt/qtopengl-${PV}[aqua,debug=,qt3support=] )
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
+ aqua? ( ~dev-qt/qtopengl-${PV}[aqua,debug=,qt3support=,${MULTILIB_USEDEP}] )
!aqua? (
media-libs/gstreamer:0.10
media-plugins/gst-plugins-meta:0.10
)
- dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
+ dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+ !kde-base/phonon-kde
+ !kde-base/phonon-xine
+ !media-libs/phonon
+ !media-sound/phonon
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild b/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
index 759970f..fb5979b 100644
--- a/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
+++ b/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
@@ -17,18 +17,18 @@ fi
IUSE="dbus qt3support"
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- ~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support=]
- !kde-base/phonon-kde
- !kde-base/phonon-xine
- !media-libs/phonon
- !media-sound/phonon
- aqua? ( ~dev-qt/qtopengl-${PV}[aqua,debug=,qt3support=] )
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
+ aqua? ( ~dev-qt/qtopengl-${PV}[aqua,debug=,qt3support=,${MULTILIB_USEDEP}] )
!aqua? (
media-libs/gstreamer:0.10
media-plugins/gst-plugins-meta:0.10
)
- dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
+ dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+ !kde-base/phonon-kde
+ !kde-base/phonon-xine
+ !media-libs/phonon
+ !media-sound/phonon
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtscript/qtscript-4.8.6.ebuild b/dev-qt/qtscript/qtscript-4.8.6.ebuild
index 3f6b70c..e00c21e 100644
--- a/dev-qt/qtscript/qtscript-4.8.6.ebuild
+++ b/dev-qt/qtscript/qtscript-4.8.6.ebuild
@@ -17,7 +17,7 @@ fi
IUSE="iconv +jit"
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtscript/qtscript-4.8.9999.ebuild b/dev-qt/qtscript/qtscript-4.8.9999.ebuild
index 3f6b70c..e00c21e 100644
--- a/dev-qt/qtscript/qtscript-4.8.9999.ebuild
+++ b/dev-qt/qtscript/qtscript-4.8.9999.ebuild
@@ -17,7 +17,7 @@ fi
IUSE="iconv +jit"
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtsql/qtsql-4.8.6.ebuild b/dev-qt/qtsql/qtsql-4.8.6.ebuild
index c899348..c66e471 100644
--- a/dev-qt/qtsql/qtsql-4.8.6.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
@@ -21,14 +21,14 @@ REQUIRED_USE="
"
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=]
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
firebird? ( dev-db/firebird )
freetds? ( dev-db/freetds )
mysql? ( virtual/mysql )
- oci8? ( dev-db/oracle-instantclient-basic )
- odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
+ oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
+ odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] dev-db/libiodbc ) )
postgres? ( dev-db/postgresql-base )
- sqlite? ( dev-db/sqlite:3 )
+ sqlite? ( dev-db/sqlite:3[${MULTILIB_USEDEP}] )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtsql/qtsql-4.8.9999.ebuild b/dev-qt/qtsql/qtsql-4.8.9999.ebuild
index c899348..c66e471 100644
--- a/dev-qt/qtsql/qtsql-4.8.9999.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.9999.ebuild
@@ -21,14 +21,14 @@ REQUIRED_USE="
"
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=]
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=,${MULTILIB_USEDEP}]
firebird? ( dev-db/firebird )
freetds? ( dev-db/freetds )
mysql? ( virtual/mysql )
- oci8? ( dev-db/oracle-instantclient-basic )
- odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
+ oci8? ( dev-db/oracle-instantclient-basic[${MULTILIB_USEDEP}] )
+ odbc? ( || ( dev-db/unixODBC[${MULTILIB_USEDEP}] dev-db/libiodbc ) )
postgres? ( dev-db/postgresql-base )
- sqlite? ( dev-db/sqlite:3 )
+ sqlite? ( dev-db/sqlite:3[${MULTILIB_USEDEP}] )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtsvg/qtsvg-4.8.6.ebuild b/dev-qt/qtsvg/qtsvg-4.8.6.ebuild
index 7228081..8813c14 100644
--- a/dev-qt/qtsvg/qtsvg-4.8.6.ebuild
+++ b/dev-qt/qtsvg/qtsvg-4.8.6.ebuild
@@ -17,9 +17,9 @@ fi
IUSE="+accessibility"
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=]
- sys-libs/zlib
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild b/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild
index 7228081..8813c14 100644
--- a/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild
+++ b/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild
@@ -17,9 +17,9 @@ fi
IUSE="+accessibility"
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
- ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=]
- sys-libs/zlib
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qttest/qttest-4.8.6.ebuild b/dev-qt/qttest/qttest-4.8.6.ebuild
index 71ef73a..d151b5f 100644
--- a/dev-qt/qttest/qttest-4.8.6.ebuild
+++ b/dev-qt/qttest/qttest-4.8.6.ebuild
@@ -17,7 +17,7 @@ fi
IUSE=""
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qttest/qttest-4.8.9999.ebuild b/dev-qt/qttest/qttest-4.8.9999.ebuild
index 71ef73a..d151b5f 100644
--- a/dev-qt/qttest/qttest-4.8.9999.ebuild
+++ b/dev-qt/qttest/qttest-4.8.9999.ebuild
@@ -17,7 +17,7 @@ fi
IUSE=""
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
index c435448..1434a14 100644
--- a/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
@@ -18,19 +18,19 @@ IUSE="+gstreamer icu +jit"
# libxml2[!icu?] is needed for bugs 407315 and 411091
DEPEND="
- dev-db/sqlite:3
- ~dev-qt/qtcore-${PV}[aqua=,debug=,ssl]
- ~dev-qt/qtgui-${PV}[aqua=,debug=]
- ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=]
- x11-libs/libX11
- x11-libs/libXrender
+ dev-db/sqlite:3[${MULTILIB_USEDEP}]
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,ssl,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXrender[${MULTILIB_USEDEP}]
gstreamer? (
- dev-libs/glib:2
- dev-libs/libxml2:2[!icu?]
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ dev-libs/libxml2:2[!icu?,${MULTILIB_USEDEP}]
>=media-libs/gstreamer-0.10.36:0.10
>=media-libs/gst-plugins-base-0.10.36:0.10
)
- icu? ( dev-libs/icu:= )
+ icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
index c435448..1434a14 100644
--- a/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
@@ -18,19 +18,19 @@ IUSE="+gstreamer icu +jit"
# libxml2[!icu?] is needed for bugs 407315 and 411091
DEPEND="
- dev-db/sqlite:3
- ~dev-qt/qtcore-${PV}[aqua=,debug=,ssl]
- ~dev-qt/qtgui-${PV}[aqua=,debug=]
- ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=]
- x11-libs/libX11
- x11-libs/libXrender
+ dev-db/sqlite:3[${MULTILIB_USEDEP}]
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,ssl,${MULTILIB_USEDEP}]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXrender[${MULTILIB_USEDEP}]
gstreamer? (
- dev-libs/glib:2
- dev-libs/libxml2:2[!icu?]
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ dev-libs/libxml2:2[!icu?,${MULTILIB_USEDEP}]
>=media-libs/gstreamer-0.10.36:0.10
>=media-libs/gst-plugins-base-0.10.36:0.10
)
- icu? ( dev-libs/icu:= )
+ icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild
index 9c99fa9..e2941e9 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild
@@ -17,7 +17,7 @@ fi
IUSE=""
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild
index 9c99fa9..e2941e9 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild
@@ -17,7 +17,7 @@ fi
IUSE=""
DEPEND="
- ~dev-qt/qtcore-${PV}[aqua=,debug=]
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
"
RDEPEND="${DEPEND}"
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] proj/qt:master commit in: dev-qt/qttest/, dev-qt/pixeltool/, dev-qt/qtmultimedia/, dev-qt/qdbusviewer/, ...
@ 2014-07-08 19:10 Davide Pesavento
0 siblings, 0 replies; 4+ messages in thread
From: Davide Pesavento @ 2014-07-08 19:10 UTC (permalink / raw
To: gentoo-commits
commit: 9e0663d66b2878e295170852722b2dbfb112cb26
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 8 19:08:05 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jul 8 19:08:05 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9e0663d6
[Qt4] Refactor phase functions so that ebuilds can override multilib_src_*
---
dev-qt/assistant/assistant-4.8.6.ebuild | 14 ++---
dev-qt/assistant/assistant-4.8.9999.ebuild | 14 ++---
dev-qt/designer/designer-4.8.6.ebuild | 14 ++---
dev-qt/designer/designer-4.8.9999.ebuild | 14 ++---
dev-qt/linguist/linguist-4.8.6.ebuild | 14 ++---
dev-qt/linguist/linguist-4.8.9999.ebuild | 14 ++---
dev-qt/pixeltool/pixeltool-4.8.6.ebuild | 10 ++--
dev-qt/pixeltool/pixeltool-4.8.9999.ebuild | 10 ++--
dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild | 14 ++---
dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild | 14 ++---
dev-qt/qt3support/qt3support-4.8.6.ebuild | 10 ++--
dev-qt/qt3support/qt3support-4.8.9999.ebuild | 10 ++--
dev-qt/qtbearer/qtbearer-4.8.6.ebuild | 10 ++--
dev-qt/qtbearer/qtbearer-4.8.9999.ebuild | 10 ++--
dev-qt/qtcore/qtcore-4.8.6.ebuild | 14 ++---
dev-qt/qtcore/qtcore-4.8.9999.ebuild | 14 ++---
dev-qt/qtdbus/qtdbus-4.8.6.ebuild | 9 ++--
dev-qt/qtdbus/qtdbus-4.8.9999.ebuild | 9 ++--
dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild | 9 ++--
dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild | 9 ++--
dev-qt/qtdemo/qtdemo-4.8.6.ebuild | 16 +++---
dev-qt/qtdemo/qtdemo-4.8.9999.ebuild | 16 +++---
dev-qt/qtgui/qtgui-4.8.6.ebuild | 19 +++----
dev-qt/qtgui/qtgui-4.8.9999.ebuild | 19 +++----
dev-qt/qthelp/qthelp-4.8.6.ebuild | 22 ++++----
dev-qt/qthelp/qthelp-4.8.9999.ebuild | 22 ++++----
dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild | 10 ++--
dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild | 10 ++--
dev-qt/qtopengl/qtopengl-4.8.6.ebuild | 15 +++---
dev-qt/qtopengl/qtopengl-4.8.9999.ebuild | 15 +++---
dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild | 15 +++---
dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild | 15 +++---
dev-qt/qtphonon/qtphonon-4.8.6.ebuild | 13 ++---
dev-qt/qtphonon/qtphonon-4.8.9999.ebuild | 13 ++---
dev-qt/qtscript/qtscript-4.8.6.ebuild | 10 ++--
dev-qt/qtscript/qtscript-4.8.9999.ebuild | 10 ++--
dev-qt/qtsql/qtsql-4.8.6.ebuild | 10 ++--
dev-qt/qtsql/qtsql-4.8.9999.ebuild | 10 ++--
dev-qt/qtsvg/qtsvg-4.8.6.ebuild | 10 ++--
dev-qt/qtsvg/qtsvg-4.8.9999.ebuild | 10 ++--
dev-qt/qttest/qttest-4.8.6.ebuild | 10 ++--
dev-qt/qttest/qttest-4.8.9999.ebuild | 10 ++--
dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild | 10 ++--
dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild | 10 ++--
dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild | 9 ++--
dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild | 9 ++--
eclass/qt4-build-multilib.eclass | 63 +++++++---------------
47 files changed, 305 insertions(+), 332 deletions(-)
diff --git a/dev-qt/assistant/assistant-4.8.6.ebuild b/dev-qt/assistant/assistant-4.8.6.ebuild
index 60846fa..0c9c6a2 100644
--- a/dev-qt/assistant/assistant-4.8.6.ebuild
+++ b/dev-qt/assistant/assistant-4.8.6.ebuild
@@ -38,19 +38,19 @@ src_prepare() {
qt4-build-multilib_src_prepare
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-system-libpng -system-libjpeg -system-zlib
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-fontconfig -no-multimedia -no-opengl -no-phonon -no-svg -no-xmlpatterns
- $(qt_use webkit)"
-
- qt4-build-multilib_src_configure
+ $(qt_use webkit)
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install_all() {
+ qt4_multilib_src_install_all
doicon tools/assistant/tools/assistant/images/assistant.png
make_desktop_entry assistant Assistant assistant 'Qt;Development;Documentation'
diff --git a/dev-qt/assistant/assistant-4.8.9999.ebuild b/dev-qt/assistant/assistant-4.8.9999.ebuild
index 60846fa..0c9c6a2 100644
--- a/dev-qt/assistant/assistant-4.8.9999.ebuild
+++ b/dev-qt/assistant/assistant-4.8.9999.ebuild
@@ -38,19 +38,19 @@ src_prepare() {
qt4-build-multilib_src_prepare
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-system-libpng -system-libjpeg -system-zlib
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-fontconfig -no-multimedia -no-opengl -no-phonon -no-svg -no-xmlpatterns
- $(qt_use webkit)"
-
- qt4-build-multilib_src_configure
+ $(qt_use webkit)
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install_all() {
+ qt4_multilib_src_install_all
doicon tools/assistant/tools/assistant/images/assistant.png
make_desktop_entry assistant Assistant assistant 'Qt;Development;Documentation'
diff --git a/dev-qt/designer/designer-4.8.6.ebuild b/dev-qt/designer/designer-4.8.6.ebuild
index 0b0d858..0915f41 100644
--- a/dev-qt/designer/designer-4.8.6.ebuild
+++ b/dev-qt/designer/designer-4.8.6.ebuild
@@ -40,18 +40,18 @@ src_prepare() {
done
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-system-libpng -system-libjpeg -system-zlib
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
-
- qt4-build-multilib_src_configure
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install() {
+ qt4_multilib_src_install
# qt-creator
# some qt-creator headers are located
diff --git a/dev-qt/designer/designer-4.8.9999.ebuild b/dev-qt/designer/designer-4.8.9999.ebuild
index 0b0d858..0915f41 100644
--- a/dev-qt/designer/designer-4.8.9999.ebuild
+++ b/dev-qt/designer/designer-4.8.9999.ebuild
@@ -40,18 +40,18 @@ src_prepare() {
done
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-system-libpng -system-libjpeg -system-zlib
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
-
- qt4-build-multilib_src_configure
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install() {
+ qt4_multilib_src_install
# qt-creator
# some qt-creator headers are located
diff --git a/dev-qt/linguist/linguist-4.8.6.ebuild b/dev-qt/linguist/linguist-4.8.6.ebuild
index 62bfacf..8307f56 100644
--- a/dev-qt/linguist/linguist-4.8.6.ebuild
+++ b/dev-qt/linguist/linguist-4.8.6.ebuild
@@ -25,18 +25,18 @@ RDEPEND="${DEPEND}"
QT4_TARGET_DIRECTORIES="tools/linguist/linguist"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-system-libpng -system-libjpeg -system-zlib
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
-
- qt4-build-multilib_src_configure
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install_all() {
+ qt4_multilib_src_install_all
newicon tools/linguist/linguist/images/icons/linguist-128-32.png linguist.png
make_desktop_entry linguist Linguist linguist 'Qt;Development;Translation'
diff --git a/dev-qt/linguist/linguist-4.8.9999.ebuild b/dev-qt/linguist/linguist-4.8.9999.ebuild
index 62bfacf..8307f56 100644
--- a/dev-qt/linguist/linguist-4.8.9999.ebuild
+++ b/dev-qt/linguist/linguist-4.8.9999.ebuild
@@ -25,18 +25,18 @@ RDEPEND="${DEPEND}"
QT4_TARGET_DIRECTORIES="tools/linguist/linguist"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-system-libpng -system-libjpeg -system-zlib
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
-
- qt4-build-multilib_src_configure
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install_all() {
+ qt4_multilib_src_install_all
newicon tools/linguist/linguist/images/icons/linguist-128-32.png linguist.png
make_desktop_entry linguist Linguist linguist 'Qt;Development;Translation'
diff --git a/dev-qt/pixeltool/pixeltool-4.8.6.ebuild b/dev-qt/pixeltool/pixeltool-4.8.6.ebuild
index 07cf48b..d2254ef 100644
--- a/dev-qt/pixeltool/pixeltool-4.8.6.ebuild
+++ b/dev-qt/pixeltool/pixeltool-4.8.6.ebuild
@@ -25,12 +25,12 @@ RDEPEND="${DEPEND}"
QT4_TARGET_DIRECTORIES="tools/pixeltool"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-system-libpng -system-libjpeg -system-zlib
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
-
- qt4-build-multilib_src_configure
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild b/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild
index 07cf48b..d2254ef 100644
--- a/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild
+++ b/dev-qt/pixeltool/pixeltool-4.8.9999.ebuild
@@ -25,12 +25,12 @@ RDEPEND="${DEPEND}"
QT4_TARGET_DIRECTORIES="tools/pixeltool"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-system-libpng -system-libjpeg -system-zlib
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
-
- qt4-build-multilib_src_configure
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild
index fe83d4c..74f27ba 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-4.8.6.ebuild
@@ -25,18 +25,18 @@ RDEPEND="${DEPEND}"
QT4_TARGET_DIRECTORIES="tools/qdbus/qdbusviewer"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-system-libpng -system-libjpeg -system-zlib
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
-
- qt4-build-multilib_src_configure
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install_all() {
+ qt4_multilib_src_install_all
newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
make_desktop_entry qdbusviewer QDBusViewer qdbusviewer 'Qt;Development'
diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild
index fe83d4c..74f27ba 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-4.8.9999.ebuild
@@ -25,18 +25,18 @@ RDEPEND="${DEPEND}"
QT4_TARGET_DIRECTORIES="tools/qdbus/qdbusviewer"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-system-libpng -system-libjpeg -system-zlib
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
-
- qt4-build-multilib_src_configure
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install_all() {
+ qt4_multilib_src_install_all
newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
make_desktop_entry qdbusviewer QDBusViewer qdbusviewer 'Qt;Development'
diff --git a/dev-qt/qt3support/qt3support-4.8.6.ebuild b/dev-qt/qt3support/qt3support-4.8.6.ebuild
index ab38a26..b5d12f9 100644
--- a/dev-qt/qt3support/qt3support-4.8.6.ebuild
+++ b/dev-qt/qt3support/qt3support-4.8.6.ebuild
@@ -28,10 +28,10 @@ QT4_TARGET_DIRECTORIES="
src/tools/uic3
tools/porting"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-qt3support
- $(qt_use accessibility)"
-
- qt4-build-multilib_src_configure
+ $(qt_use accessibility)
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qt3support/qt3support-4.8.9999.ebuild b/dev-qt/qt3support/qt3support-4.8.9999.ebuild
index ab38a26..b5d12f9 100644
--- a/dev-qt/qt3support/qt3support-4.8.9999.ebuild
+++ b/dev-qt/qt3support/qt3support-4.8.9999.ebuild
@@ -28,10 +28,10 @@ QT4_TARGET_DIRECTORIES="
src/tools/uic3
tools/porting"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-qt3support
- $(qt_use accessibility)"
-
- qt4-build-multilib_src_configure
+ $(qt_use accessibility)
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtbearer/qtbearer-4.8.6.ebuild b/dev-qt/qtbearer/qtbearer-4.8.6.ebuild
index bb01c0a..5d2b47b 100644
--- a/dev-qt/qtbearer/qtbearer-4.8.6.ebuild
+++ b/dev-qt/qtbearer/qtbearer-4.8.6.ebuild
@@ -33,15 +33,15 @@ pkg_setup() {
$(use networkmanager && echo src/plugins/bearer/networkmanager)"
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
$(use connman || use networkmanager || echo -no-dbus)
-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
-no-cups -no-gtkstyle -no-nas-sound -no-opengl
-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
- -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb"
-
- qt4-build-multilib_src_configure
+ -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild b/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
index bb01c0a..5d2b47b 100644
--- a/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
+++ b/dev-qt/qtbearer/qtbearer-4.8.9999.ebuild
@@ -33,15 +33,15 @@ pkg_setup() {
$(use networkmanager && echo src/plugins/bearer/networkmanager)"
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
$(use connman || use networkmanager || echo -no-dbus)
-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
-no-cups -no-gtkstyle -no-nas-sound -no-opengl
-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
- -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb"
-
- qt4-build-multilib_src_configure
+ -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild b/dev-qt/qtcore/qtcore-4.8.6.ebuild
index b7e20b6..4ceb304 100644
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild
@@ -68,8 +68,8 @@ src_prepare() {
configure || die "sed configure setBootstrapVariable failed"
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
@@ -80,13 +80,13 @@ src_configure() {
$(qt_use iconv)
$(qt_use icu)
$(use ssl && echo -openssl-linked || echo -no-openssl)
- $(qt_use qt3support)"
-
- qt4-build-multilib_src_configure
+ $(qt_use qt3support)
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install_all() {
+ qt4_multilib_src_install_all
# List all the multilib libdirs
local libdirs=
diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index b7e20b6..4ceb304 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -68,8 +68,8 @@ src_prepare() {
configure || die "sed configure setBootstrapVariable failed"
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
@@ -80,13 +80,13 @@ src_configure() {
$(qt_use iconv)
$(qt_use icu)
$(use ssl && echo -openssl-linked || echo -no-openssl)
- $(qt_use qt3support)"
-
- qt4-build-multilib_src_configure
+ $(qt_use qt3support)
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install_all() {
+ qt4_multilib_src_install_all
# List all the multilib libdirs
local libdirs=
diff --git a/dev-qt/qtdbus/qtdbus-4.8.6.ebuild b/dev-qt/qtdbus/qtdbus-4.8.6.ebuild
index df916b8..3127e24 100644
--- a/dev-qt/qtdbus/qtdbus-4.8.6.ebuild
+++ b/dev-qt/qtdbus/qtdbus-4.8.6.ebuild
@@ -36,8 +36,9 @@ QT4_TARGET_DIRECTORIES="
QCONFIG_ADD="dbus dbus-linked"
QCONFIG_DEFINE="QT_DBUS"
-src_configure() {
- myconf+=" -dbus-linked"
-
- qt4-build-multilib_src_configure
+multilib_src_configure() {
+ local myconf=(
+ -dbus-linked
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild b/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild
index df916b8..3127e24 100644
--- a/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild
+++ b/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild
@@ -36,8 +36,9 @@ QT4_TARGET_DIRECTORIES="
QCONFIG_ADD="dbus dbus-linked"
QCONFIG_DEFINE="QT_DBUS"
-src_configure() {
- myconf+=" -dbus-linked"
-
- qt4-build-multilib_src_configure
+multilib_src_configure() {
+ local myconf=(
+ -dbus-linked
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild
index 5a5c974..4750e3e 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.6.ebuild
@@ -44,11 +44,12 @@ pkg_setup() {
src/3rdparty/webkit/Source/WebKit/qt/declarative"
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-declarative -no-gtkstyle
$(qt_use accessibility)
$(qt_use qt3support)
- $(qt_use webkit)"
- qt4-build-multilib_src_configure
+ $(qt_use webkit)
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
index 5a5c974..4750e3e 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.9999.ebuild
@@ -44,11 +44,12 @@ pkg_setup() {
src/3rdparty/webkit/Source/WebKit/qt/declarative"
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-declarative -no-gtkstyle
$(qt_use accessibility)
$(qt_use qt3support)
- $(qt_use webkit)"
- qt4-build-multilib_src_configure
+ $(qt_use webkit)
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtdemo/qtdemo-4.8.6.ebuild b/dev-qt/qtdemo/qtdemo-4.8.6.ebuild
index e74659d..6128e3d 100644
--- a/dev-qt/qtdemo/qtdemo-4.8.6.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.6.ebuild
@@ -82,8 +82,8 @@ src_prepare() {
examples/graphicsview/graphicsview.pro || die
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
$(qt_use dbus)
$(qt_use declarative)
$(qt_use multimedia) -no-audio-backend
@@ -91,14 +91,14 @@ src_configure() {
$(qt_use openvg)
$(qt_use phonon) -no-phonon-backend
$(qt_use webkit)
- $(qt_use xmlpatterns)"
-
- qt4-build-multilib_src_configure
+ $(qt_use xmlpatterns)
+ )
+ qt4_multilib_src_configure
}
-src_install() {
+multilib_src_install_all() {
+ qt4_multilib_src_install_all
+
insinto "${QT4_DOCDIR#${EPREFIX}}"/src
doins -r doc/src/images
-
- qt4-build-multilib_src_install
}
diff --git a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
index e74659d..6128e3d 100644
--- a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
@@ -82,8 +82,8 @@ src_prepare() {
examples/graphicsview/graphicsview.pro || die
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
$(qt_use dbus)
$(qt_use declarative)
$(qt_use multimedia) -no-audio-backend
@@ -91,14 +91,14 @@ src_configure() {
$(qt_use openvg)
$(qt_use phonon) -no-phonon-backend
$(qt_use webkit)
- $(qt_use xmlpatterns)"
-
- qt4-build-multilib_src_configure
+ $(qt_use xmlpatterns)
+ )
+ qt4_multilib_src_configure
}
-src_install() {
+multilib_src_install_all() {
+ qt4_multilib_src_install_all
+
insinto "${QT4_DOCDIR#${EPREFIX}}"/src
doins -r doc/src/images
-
- qt4-build-multilib_src_install
}
diff --git a/dev-qt/qtgui/qtgui-4.8.6.ebuild b/dev-qt/qtgui/qtgui-4.8.6.ebuild
index 2adb6dc..ed74f5d 100644
--- a/dev-qt/qtgui/qtgui-4.8.6.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.6.ebuild
@@ -129,8 +129,8 @@ src_prepare() {
sed -i -e 's:|-xinerama|:&-xvideo|:' configure || die
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
$(qt_use accessibility)
$(qt_use cups)
$(qt_use glib)
@@ -146,18 +146,15 @@ src_configure() {
-system-libpng -system-libjpeg -system-zlib
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
-
- # bug 367045
- [[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3"
-
- qt4-build-multilib_src_configure
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl
+ $([[ ${CHOST} == *86*-apple-darwin* ]] && echo -no-ssse3) # bug 367045
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install_all() {
+ qt4_multilib_src_install_all
- # touch the available graphics systems
dodir /usr/share/qt4/graphicssystems
echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die
echo "" > "${ED}"/usr/share/qt4/graphicssystems/native || die
diff --git a/dev-qt/qtgui/qtgui-4.8.9999.ebuild b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
index 6a3641e..e4f0746 100644
--- a/dev-qt/qtgui/qtgui-4.8.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.9999.ebuild
@@ -126,8 +126,8 @@ src_prepare() {
sed -i -e 's:|-xinerama|:&-xvideo|:' configure || die
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
$(qt_use accessibility)
$(qt_use cups)
$(qt_use glib)
@@ -143,18 +143,15 @@ src_configure() {
-system-libpng -system-libjpeg -system-zlib
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
- -fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
-
- # bug 367045
- [[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3"
-
- qt4-build-multilib_src_configure
+ -fontconfig -no-svg -no-webkit -no-phonon -no-opengl
+ $([[ ${CHOST} == *86*-apple-darwin* ]] && echo -no-ssse3) # bug 367045
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install_all() {
+ qt4_multilib_src_install_all
- # touch the available graphics systems
dodir /usr/share/qt4/graphicssystems
echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die
echo "" > "${ED}"/usr/share/qt4/graphicssystems/native || die
diff --git a/dev-qt/qthelp/qthelp-4.8.6.ebuild b/dev-qt/qthelp/qthelp-4.8.6.ebuild
index 70ac632..9b7a09c 100644
--- a/dev-qt/qthelp/qthelp-4.8.6.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.6.ebuild
@@ -69,23 +69,23 @@ src_prepare() {
sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-system-libpng -system-libjpeg -system-zlib
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-no-multimedia -no-opengl -no-phonon -no-qt3support -no-svg -no-webkit -no-xmlpatterns
- -no-nas-sound -no-cups -no-nis -fontconfig"
-
- qt4-build-multilib_src_configure
+ -no-nas-sound -no-cups -no-nis -fontconfig
+ )
+ qt4_multilib_src_configure
}
-src_compile() {
- qt4-build-multilib_src_compile
+multilib_src_compile() {
+ qt4_multilib_src_compile
# qhelpgenerator needs libQtHelp.so.4
- export LD_LIBRARY_PATH=${S}/lib
- export DYLD_LIBRARY_PATH=${S}/lib:${S}/lib/QtHelp.framework
+ export LD_LIBRARY_PATH=${BUILD_DIR}/lib
+ export DYLD_LIBRARY_PATH=${BUILD_DIR}/lib:${BUILD_DIR}/lib/QtHelp.framework
if use doc; then
emake docs
@@ -95,8 +95,8 @@ src_compile() {
fi
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install() {
+ qt4_multilib_src_install
emake INSTALL_ROOT="${D}" install_qchdocs
diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
index 70ac632..9b7a09c 100644
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
@@ -69,23 +69,23 @@ src_prepare() {
sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-system-libpng -system-libjpeg -system-zlib
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-no-multimedia -no-opengl -no-phonon -no-qt3support -no-svg -no-webkit -no-xmlpatterns
- -no-nas-sound -no-cups -no-nis -fontconfig"
-
- qt4-build-multilib_src_configure
+ -no-nas-sound -no-cups -no-nis -fontconfig
+ )
+ qt4_multilib_src_configure
}
-src_compile() {
- qt4-build-multilib_src_compile
+multilib_src_compile() {
+ qt4_multilib_src_compile
# qhelpgenerator needs libQtHelp.so.4
- export LD_LIBRARY_PATH=${S}/lib
- export DYLD_LIBRARY_PATH=${S}/lib:${S}/lib/QtHelp.framework
+ export LD_LIBRARY_PATH=${BUILD_DIR}/lib
+ export DYLD_LIBRARY_PATH=${BUILD_DIR}/lib:${BUILD_DIR}/lib/QtHelp.framework
if use doc; then
emake docs
@@ -95,8 +95,8 @@ src_compile() {
fi
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install() {
+ qt4_multilib_src_install
emake INSTALL_ROOT="${D}" install_qchdocs
diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild
index 32318e3..5f20ad2 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-4.8.6.ebuild
@@ -32,8 +32,8 @@ QT4_TARGET_DIRECTORIES="src/multimedia"
QCONFIG_ADD="multimedia"
QCONFIG_DEFINE="QT_MULTIMEDIA"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-multimedia -audio-backend
$(qt_use alsa)
-no-accessibility -no-qt3support -no-xmlpatterns -no-phonon -no-phonon-backend
@@ -41,7 +41,7 @@ src_configure() {
-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
- -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb"
-
- qt4-build-multilib_src_configure
+ -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild
index 32318e3..5f20ad2 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-4.8.9999.ebuild
@@ -32,8 +32,8 @@ QT4_TARGET_DIRECTORIES="src/multimedia"
QCONFIG_ADD="multimedia"
QCONFIG_DEFINE="QT_MULTIMEDIA"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-multimedia -audio-backend
$(qt_use alsa)
-no-accessibility -no-qt3support -no-xmlpatterns -no-phonon -no-phonon-backend
@@ -41,7 +41,7 @@ src_configure() {
-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
- -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb"
-
- qt4-build-multilib_src_configure
+ -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtopengl/qtopengl-4.8.6.ebuild b/dev-qt/qtopengl/qtopengl-4.8.6.ebuild
index 8c08988..77e064e 100644
--- a/dev-qt/qtopengl/qtopengl-4.8.6.ebuild
+++ b/dev-qt/qtopengl/qtopengl-4.8.6.ebuild
@@ -32,19 +32,18 @@ QT4_TARGET_DIRECTORIES="
QCONFIG_ADD="opengl"
QCONFIG_DEFINE="QT_OPENGL"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-opengl
$(qt_use qt3support)
- $(qt_use egl)"
-
- qt4-build-multilib_src_configure
+ $(qt_use egl)
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install_all() {
+ qt4_multilib_src_install_all
- # touch the available graphics systems
dodir /usr/share/qt4/graphicssystems
echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/opengl || die
}
diff --git a/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild b/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild
index 8c08988..77e064e 100644
--- a/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild
+++ b/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild
@@ -32,19 +32,18 @@ QT4_TARGET_DIRECTORIES="
QCONFIG_ADD="opengl"
QCONFIG_DEFINE="QT_OPENGL"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-opengl
$(qt_use qt3support)
- $(qt_use egl)"
-
- qt4-build-multilib_src_configure
+ $(qt_use egl)
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install_all() {
+ qt4_multilib_src_install_all
- # touch the available graphics systems
dodir /usr/share/qt4/graphicssystems
echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/opengl || die
}
diff --git a/dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild b/dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild
index 84799f5..23bf1dc 100644
--- a/dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild
+++ b/dev-qt/qtopenvg/qtopenvg-4.8.6.ebuild
@@ -30,18 +30,17 @@ QT4_TARGET_DIRECTORIES="
QCONFIG_ADD="openvg"
QCONFIG_DEFINE="QT_OPENVG"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-openvg -egl
- $(qt_use qt3support)"
-
- qt4-build-multilib_src_configure
+ $(qt_use qt3support)
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install() {
+ qt4_multilib_src_install
- # touch the available graphics systems
dodir /usr/share/qt4/graphicssystems
echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/openvg || die
}
diff --git a/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild b/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild
index 84799f5..23bf1dc 100644
--- a/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild
+++ b/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild
@@ -30,18 +30,17 @@ QT4_TARGET_DIRECTORIES="
QCONFIG_ADD="openvg"
QCONFIG_DEFINE="QT_OPENVG"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-openvg -egl
- $(qt_use qt3support)"
-
- qt4-build-multilib_src_configure
+ $(qt_use qt3support)
+ )
+ qt4_multilib_src_configure
}
-src_install() {
- qt4-build-multilib_src_install
+multilib_src_install() {
+ qt4_multilib_src_install
- # touch the available graphics systems
dodir /usr/share/qt4/graphicssystems
echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/openvg || die
}
diff --git a/dev-qt/qtphonon/qtphonon-4.8.6.ebuild b/dev-qt/qtphonon/qtphonon-4.8.6.ebuild
index be7dca9..5f2a9df 100644
--- a/dev-qt/qtphonon/qtphonon-4.8.6.ebuild
+++ b/dev-qt/qtphonon/qtphonon-4.8.6.ebuild
@@ -39,16 +39,17 @@ QT4_TARGET_DIRECTORIES="
QCONFIG_ADD="phonon"
pkg_setup() {
- QCONFIG_DEFINE="QT_PHONON
+ QCONFIG_DEFINE="
+ QT_PHONON
$(use aqua || echo QT_GSTREAMER)"
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-phonon -phonon-backend
-no-opengl -no-svg
$(qt_use dbus qdbus)
- $(qt_use qt3support)"
-
- qt4-build-multilib_src_configure
+ $(qt_use qt3support)
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild b/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
index be7dca9..5f2a9df 100644
--- a/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
+++ b/dev-qt/qtphonon/qtphonon-4.8.9999.ebuild
@@ -39,16 +39,17 @@ QT4_TARGET_DIRECTORIES="
QCONFIG_ADD="phonon"
pkg_setup() {
- QCONFIG_DEFINE="QT_PHONON
+ QCONFIG_DEFINE="
+ QT_PHONON
$(use aqua || echo QT_GSTREAMER)"
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-phonon -phonon-backend
-no-opengl -no-svg
$(qt_use dbus qdbus)
- $(qt_use qt3support)"
-
- qt4-build-multilib_src_configure
+ $(qt_use qt3support)
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtscript/qtscript-4.8.6.ebuild b/dev-qt/qtscript/qtscript-4.8.6.ebuild
index e00c21e..d45f75c 100644
--- a/dev-qt/qtscript/qtscript-4.8.6.ebuild
+++ b/dev-qt/qtscript/qtscript-4.8.6.ebuild
@@ -26,8 +26,8 @@ QT4_TARGET_DIRECTORIES="src/script"
QCONFIG_ADD="script"
QCONFIG_DEFINE="QT_SCRIPT"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
$(qt_use iconv)
$(qt_use jit javascript-jit)
-no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor -no-xinerama
@@ -35,7 +35,7 @@ src_configure() {
-no-libpng -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
-no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg
- -no-gtkstyle"
-
- qt4-build-multilib_src_configure
+ -no-gtkstyle
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtscript/qtscript-4.8.9999.ebuild b/dev-qt/qtscript/qtscript-4.8.9999.ebuild
index e00c21e..d45f75c 100644
--- a/dev-qt/qtscript/qtscript-4.8.9999.ebuild
+++ b/dev-qt/qtscript/qtscript-4.8.9999.ebuild
@@ -26,8 +26,8 @@ QT4_TARGET_DIRECTORIES="src/script"
QCONFIG_ADD="script"
QCONFIG_DEFINE="QT_SCRIPT"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
$(qt_use iconv)
$(qt_use jit javascript-jit)
-no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor -no-xinerama
@@ -35,7 +35,7 @@ src_configure() {
-no-libpng -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
-no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg
- -no-gtkstyle"
-
- qt4-build-multilib_src_configure
+ -no-gtkstyle
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtsql/qtsql-4.8.6.ebuild b/dev-qt/qtsql/qtsql-4.8.6.ebuild
index 803a39a..cd5918f 100644
--- a/dev-qt/qtsql/qtsql-4.8.6.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.6.ebuild
@@ -35,8 +35,8 @@ QT4_TARGET_DIRECTORIES="
src/sql
src/plugins/sqldrivers"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
$(qt_native_use freetds sql-tds plugin)
$(qt_native_use mysql sql-mysql plugin) $(use mysql && multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
$(qt_use oci8 sql-oci plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
@@ -54,7 +54,7 @@ src_configure() {
-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
- -no-glib"
-
- qt4-build-multilib_src_configure
+ -no-glib
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtsql/qtsql-4.8.9999.ebuild b/dev-qt/qtsql/qtsql-4.8.9999.ebuild
index 803a39a..cd5918f 100644
--- a/dev-qt/qtsql/qtsql-4.8.9999.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.9999.ebuild
@@ -35,8 +35,8 @@ QT4_TARGET_DIRECTORIES="
src/sql
src/plugins/sqldrivers"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
$(qt_native_use freetds sql-tds plugin)
$(qt_native_use mysql sql-mysql plugin) $(use mysql && multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
$(qt_use oci8 sql-oci plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
@@ -54,7 +54,7 @@ src_configure() {
-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
- -no-glib"
-
- qt4-build-multilib_src_configure
+ -no-glib
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtsvg/qtsvg-4.8.6.ebuild b/dev-qt/qtsvg/qtsvg-4.8.6.ebuild
index 8813c14..b61bbe5 100644
--- a/dev-qt/qtsvg/qtsvg-4.8.6.ebuild
+++ b/dev-qt/qtsvg/qtsvg-4.8.6.ebuild
@@ -31,8 +31,8 @@ QT4_TARGET_DIRECTORIES="
QCONFIG_ADD="svg"
QCONFIG_DEFINE="QT_SVG"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-svg
$(qt_use accessibility)
-no-xkb -no-xrender
@@ -40,7 +40,7 @@ src_configure() {
-no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
- -no-fontconfig -no-glib -no-gtkstyle"
-
- qt4-build-multilib_src_configure
+ -no-fontconfig -no-glib -no-gtkstyle
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild b/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild
index 8813c14..b61bbe5 100644
--- a/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild
+++ b/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild
@@ -31,8 +31,8 @@ QT4_TARGET_DIRECTORIES="
QCONFIG_ADD="svg"
QCONFIG_DEFINE="QT_SVG"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-svg
$(qt_use accessibility)
-no-xkb -no-xrender
@@ -40,7 +40,7 @@ src_configure() {
-no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
- -no-fontconfig -no-glib -no-gtkstyle"
-
- qt4-build-multilib_src_configure
+ -no-fontconfig -no-glib -no-gtkstyle
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qttest/qttest-4.8.6.ebuild b/dev-qt/qttest/qttest-4.8.6.ebuild
index d151b5f..2eb2656 100644
--- a/dev-qt/qttest/qttest-4.8.6.ebuild
+++ b/dev-qt/qttest/qttest-4.8.6.ebuild
@@ -23,14 +23,14 @@ RDEPEND="${DEPEND}"
QT4_TARGET_DIRECTORIES="src/testlib"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor
-no-xinerama -no-xshape -no-sm -no-opengl
-no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
- -no-accessibility -no-fontconfig -no-glib -no-svg"
-
- qt4-build-multilib_src_configure
+ -no-accessibility -no-fontconfig -no-glib -no-svg
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qttest/qttest-4.8.9999.ebuild b/dev-qt/qttest/qttest-4.8.9999.ebuild
index d151b5f..2eb2656 100644
--- a/dev-qt/qttest/qttest-4.8.9999.ebuild
+++ b/dev-qt/qttest/qttest-4.8.9999.ebuild
@@ -23,14 +23,14 @@ RDEPEND="${DEPEND}"
QT4_TARGET_DIRECTORIES="src/testlib"
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor
-no-xinerama -no-xshape -no-sm -no-opengl
-no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
- -no-accessibility -no-fontconfig -no-glib -no-svg"
-
- qt4-build-multilib_src_configure
+ -no-accessibility -no-fontconfig -no-glib -no-svg
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
index d3719f0..bc6ee6b 100644
--- a/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-4.8.6.ebuild
@@ -63,13 +63,13 @@ src_prepare() {
qt4-build-multilib_src_prepare
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-webkit
-system-sqlite
$(qt_use icu)
$(qt_use jit javascript-jit)
- $(use gstreamer || echo -DENABLE_VIDEO=0)"
-
- qt4-build-multilib_src_configure
+ $(use gstreamer || echo -DENABLE_VIDEO=0)
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
index d3719f0..bc6ee6b 100644
--- a/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild
@@ -63,13 +63,13 @@ src_prepare() {
qt4-build-multilib_src_prepare
}
-src_configure() {
- myconf+="
+multilib_src_configure() {
+ local myconf=(
-webkit
-system-sqlite
$(qt_use icu)
$(qt_use jit javascript-jit)
- $(use gstreamer || echo -DENABLE_VIDEO=0)"
-
- qt4-build-multilib_src_configure
+ $(use gstreamer || echo -DENABLE_VIDEO=0)
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild
index e2941e9..2234419 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.6.ebuild
@@ -29,8 +29,9 @@ QT4_TARGET_DIRECTORIES="
QCONFIG_ADD="xmlpatterns"
QCONFIG_DEFINE="QT_XMLPATTERNS"
-src_configure() {
- myconf+=" -xmlpatterns"
-
- qt4-build-multilib_src_configure
+multilib_src_configure() {
+ local myconf=(
+ -xmlpatterns
+ )
+ qt4_multilib_src_configure
}
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild
index e2941e9..2234419 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.9999.ebuild
@@ -29,8 +29,9 @@ QT4_TARGET_DIRECTORIES="
QCONFIG_ADD="xmlpatterns"
QCONFIG_DEFINE="QT_XMLPATTERNS"
-src_configure() {
- myconf+=" -xmlpatterns"
-
- qt4-build-multilib_src_configure
+multilib_src_configure() {
+ local myconf=(
+ -xmlpatterns
+ )
+ qt4_multilib_src_configure
}
diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index c685334..7693930 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -54,7 +54,16 @@ RDEPEND="
dev-qt/qtchooser
"
-EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm
+
+# src_{configure,compile,test,install} are inherited from multilib-minimal
+EXPORT_FUNCTIONS src_unpack src_prepare pkg_postinst pkg_postrm
+
+multilib_src_configure() { qt4_multilib_src_configure; }
+multilib_src_compile() { qt4_multilib_src_compile; }
+multilib_src_test() { qt4_multilib_src_test; }
+multilib_src_install() { qt4_multilib_src_install; }
+multilib_src_install_all() { qt4_multilib_src_install_all; }
+
# @ECLASS-VARIABLE: PATCHES
# @DEFAULT_UNSET
@@ -257,14 +266,7 @@ qt4-build-multilib_src_prepare() {
epatch_user
}
-# @FUNCTION: qt4-build-multilib_src_configure
-# @DESCRIPTION:
-# Runs configure and generates Makefiles for all QT4_TARGET_DIRECTORIES.
-qt4-build-multilib_src_configure() {
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
+qt4_multilib_src_configure() {
qt4_prepare_env
if [[ ${PN} != qtcore ]]; then
@@ -373,8 +375,10 @@ multilib_src_configure() {
fi
fi
- # append module-specific arguments
- conf+=(${myconf})
+ conf+=(
+ # module-specific options
+ "${myconf[@]}"
+ )
einfo "Configuring with: ${conf[@]}"
"${S}"/configure "${conf[@]}" || die "configure failed"
@@ -389,41 +393,19 @@ multilib_src_configure() {
qt4_foreach_target_subdir qt4_qmake
}
-# @FUNCTION: qt4-build-multilib_src_compile
-# @DESCRIPTION:
-# Compiles the code in QT4_TARGET_DIRECTORIES.
-qt4-build-multilib_src_compile() {
- multilib-minimal_src_compile
-}
-
-multilib_src_compile() {
+qt4_multilib_src_compile() {
qt4_prepare_env
qt4_foreach_target_subdir emake
}
-# @FUNCTION: qt4-build-multilib_src_test
-# @DESCRIPTION:
-# Runs unit tests in all QT4_TARGET_DIRECTORIES.
-qt4-build-multilib_src_test() {
- multilib-minimal_src_test
-}
-
-multilib_src_test() {
+qt4_multilib_src_test() {
qt4_prepare_env
qt4_foreach_target_subdir emake -j1 check
}
-# @FUNCTION: qt4-build-multilib_src_install
-# @DESCRIPTION:
-# Performs the actual installation, running 'emake install'
-# in all QT4_TARGET_DIRECTORIES, and installing qconfigs.
-qt4-build-multilib_src_install() {
- multilib-minimal_src_install
-}
-
-multilib_src_install() {
+qt4_multilib_src_install() {
qt4_prepare_env
qt4_foreach_target_subdir emake INSTALL_ROOT="${D}" install
@@ -438,14 +420,7 @@ multilib_src_install() {
fix_includes
}
-multilib_src_install_all() {
- qt4-build-multilib_src_install_all
-}
-
-# @FUNCTION: qt4-build-multilib_src_install_all
-# @DESCRIPTION:
-# Common install phase for all multilib ABIs.
-qt4-build-multilib_src_install_all() {
+qt4_multilib_src_install_all() {
# install private headers of a few modules
if has ${PN} qtcore qtdeclarative qtgui qtscript; then
local moduledir=${PN#qt}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-07-08 19:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-20 21:22 [gentoo-commits] proj/qt:master commit in: dev-qt/qttest/, dev-qt/pixeltool/, dev-qt/qtmultimedia/, dev-qt/qdbusviewer/, Davide Pesavento
-- strict thread matches above, loose matches on Subject: below --
2014-05-23 0:11 Davide Pesavento
2014-06-02 18:44 Davide Pesavento
2014-07-08 19:10 Davide Pesavento
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox