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}"
