diff options
author | Davide Pesavento <davidepesa@gmail.com> | 2013-03-24 17:20:05 -0700 |
---|---|---|
committer | Davide Pesavento <davidepesa@gmail.com> | 2013-03-24 17:20:05 -0700 |
commit | 095d402da117001c5ac29a35c484198045b3f666 (patch) | |
tree | 40690c15cfd327ea9abc4de6b396346d2b860064 | |
parent | [dev-qt/qtdbus] Fix bug 462592 by kensington. (diff) | |
download | qt-095d402da117001c5ac29a35c484198045b3f666.tar.gz qt-095d402da117001c5ac29a35c484198045b3f666.tar.bz2 qt-095d402da117001c5ac29a35c484198045b3f666.zip |
[dev-qt/*] Sort deps.
26 files changed, 38 insertions, 38 deletions
diff --git a/dev-qt/qt-components/qt-components-9999.ebuild b/dev-qt/qt-components/qt-components-9999.ebuild index ba22af48..b0c7b9a5 100644 --- a/dev-qt/qt-components/qt-components-9999.ebuild +++ b/dev-qt/qt-components/qt-components-9999.ebuild @@ -21,10 +21,10 @@ DEPEND=" >=dev-qt/qtcore-4.7.4:4 >=dev-qt/qtdeclarative-4.7.4:4 meego? ( - x11-libs/libXdamage - x11-libs/libXrandr >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtopengl-4.7.4:4 + x11-libs/libXdamage + x11-libs/libXrandr mobility? ( >=dev-qt/qt-mobility-1.2[systeminfo] ) ) symbian? ( diff --git a/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild b/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild index 37021651..af529e88 100644 --- a/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild +++ b/dev-qt/qtdbus/qtdbus-4.8.9999.ebuild @@ -16,8 +16,8 @@ fi IUSE="" DEPEND=" - >=sys-apps/dbus-1.2 ~dev-qt/qtcore-${PV}[aqua=,debug=] + >=sys-apps/dbus-1.2 " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtdbus/qtdbus-5.0.1.ebuild b/dev-qt/qtdbus/qtdbus-5.0.1.ebuild index 45849345..985e901c 100644 --- a/dev-qt/qtdbus/qtdbus-5.0.1.ebuild +++ b/dev-qt/qtdbus/qtdbus-5.0.1.ebuild @@ -19,9 +19,9 @@ fi IUSE="" DEPEND=" + ~dev-qt/qtcore-${PV}[debug=] >=sys-apps/dbus-1.4.20 sys-libs/zlib - ~dev-qt/qtcore-${PV}[debug=] " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtdbus/qtdbus-5.0.9999.ebuild b/dev-qt/qtdbus/qtdbus-5.0.9999.ebuild index 134e2da3..12f75f83 100644 --- a/dev-qt/qtdbus/qtdbus-5.0.9999.ebuild +++ b/dev-qt/qtdbus/qtdbus-5.0.9999.ebuild @@ -19,9 +19,9 @@ fi IUSE="" DEPEND=" + ~dev-qt/qtcore-${PV}[debug=] >=sys-apps/dbus-1.4.20 sys-libs/zlib - ~dev-qt/qtcore-${PV}[debug=] " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtdbus/qtdbus-5.9999.ebuild b/dev-qt/qtdbus/qtdbus-5.9999.ebuild index 134e2da3..12f75f83 100644 --- a/dev-qt/qtdbus/qtdbus-5.9999.ebuild +++ b/dev-qt/qtdbus/qtdbus-5.9999.ebuild @@ -19,9 +19,9 @@ fi IUSE="" DEPEND=" + ~dev-qt/qtcore-${PV}[debug=] >=sys-apps/dbus-1.4.20 sys-libs/zlib - ~dev-qt/qtcore-${PV}[debug=] " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild index b3e55ed3..4e0442e9 100644 --- a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild +++ b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild @@ -16,9 +16,9 @@ fi IUSE="dbus declarative kde multimedia opengl openvg qt3support webkit xmlpatterns" DEPEND=" - ~dev-qt/qthelp-${PV}:4[aqua=,debug=] ~dev-qt/qtcore-${PV}:4[aqua=,debug=,qt3support?] ~dev-qt/qtgui-${PV}:4[aqua=,debug=,qt3support?] + ~dev-qt/qthelp-${PV}:4[aqua=,debug=] ~dev-qt/qtscript-${PV}:4[aqua=,debug=] ~dev-qt/qtsql-${PV}:4[aqua=,debug=,qt3support?] ~dev-qt/qtsvg-${PV}:4[aqua=,debug=] diff --git a/dev-qt/qtgui/qtgui-4.8.9999.ebuild b/dev-qt/qtgui/qtgui-4.8.9999.ebuild index 989993f5..beae61ef 100644 --- a/dev-qt/qtgui/qtgui-4.8.9999.ebuild +++ b/dev-qt/qtgui/qtgui-4.8.9999.ebuild @@ -22,13 +22,13 @@ 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 - ~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=] - ~dev-qt/qtscript-${PV}[aqua=,debug=] !aqua? ( x11-libs/libICE x11-libs/libSM diff --git a/dev-qt/qtgui/qtgui-5.0.1.ebuild b/dev-qt/qtgui/qtgui-5.0.1.ebuild index 2d8e04e8..3a33fa1b 100644 --- a/dev-qt/qtgui/qtgui-5.0.1.ebuild +++ b/dev-qt/qtgui/qtgui-5.0.1.ebuild @@ -27,10 +27,10 @@ REQUIRED_USE=" " RDEPEND=" + ~dev-qt/qtcore-${PV}[debug=,glib=] media-libs/fontconfig media-libs/freetype:2 sys-libs/zlib - ~dev-qt/qtcore-${PV}[debug=,glib=] egl? ( media-libs/mesa[egl] ) gif? ( media-libs/giflib ) gles2? ( || ( diff --git a/dev-qt/qtgui/qtgui-5.0.9999.ebuild b/dev-qt/qtgui/qtgui-5.0.9999.ebuild index 1791abee..f2d07c5a 100644 --- a/dev-qt/qtgui/qtgui-5.0.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.0.9999.ebuild @@ -26,10 +26,10 @@ REQUIRED_USE=" " RDEPEND=" + ~dev-qt/qtcore-${PV}[debug=,glib=] media-libs/fontconfig media-libs/freetype:2 sys-libs/zlib - ~dev-qt/qtcore-${PV}[debug=,glib=] gif? ( media-libs/giflib ) gles2? ( || ( media-libs/mesa[egl,gles2] diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild index 1791abee..f2d07c5a 100644 --- a/dev-qt/qtgui/qtgui-5.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.9999.ebuild @@ -26,10 +26,10 @@ REQUIRED_USE=" " RDEPEND=" + ~dev-qt/qtcore-${PV}[debug=,glib=] media-libs/fontconfig media-libs/freetype:2 sys-libs/zlib - ~dev-qt/qtcore-${PV}[debug=,glib=] gif? ( media-libs/giflib ) gles2? ( || ( media-libs/mesa[egl,gles2] diff --git a/dev-qt/qtjsbackend/qtjsbackend-5.0.1.ebuild b/dev-qt/qtjsbackend/qtjsbackend-5.0.1.ebuild index 0db8e11a..4b0e2bbb 100644 --- a/dev-qt/qtjsbackend/qtjsbackend-5.0.1.ebuild +++ b/dev-qt/qtjsbackend/qtjsbackend-5.0.1.ebuild @@ -18,7 +18,7 @@ fi IUSE="" -# yep, qt-core is a build-time dep only +# qtcore is a build-time dep only RDEPEND="" DEPEND="${RDEPEND} ${PYTHON_DEPS} diff --git a/dev-qt/qtjsbackend/qtjsbackend-5.0.9999.ebuild b/dev-qt/qtjsbackend/qtjsbackend-5.0.9999.ebuild index 0db8e11a..4b0e2bbb 100644 --- a/dev-qt/qtjsbackend/qtjsbackend-5.0.9999.ebuild +++ b/dev-qt/qtjsbackend/qtjsbackend-5.0.9999.ebuild @@ -18,7 +18,7 @@ fi IUSE="" -# yep, qt-core is a build-time dep only +# qtcore is a build-time dep only RDEPEND="" DEPEND="${RDEPEND} ${PYTHON_DEPS} diff --git a/dev-qt/qtjsbackend/qtjsbackend-5.9999.ebuild b/dev-qt/qtjsbackend/qtjsbackend-5.9999.ebuild index 0db8e11a..4b0e2bbb 100644 --- a/dev-qt/qtjsbackend/qtjsbackend-5.9999.ebuild +++ b/dev-qt/qtjsbackend/qtjsbackend-5.9999.ebuild @@ -18,7 +18,7 @@ fi IUSE="" -# yep, qt-core is a build-time dep only +# qtcore is a build-time dep only RDEPEND="" DEPEND="${RDEPEND} ${PYTHON_DEPS} diff --git a/dev-qt/qtnetwork/qtnetwork-5.0.1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.0.1.ebuild index 57339099..eb39969a 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.0.1.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.0.1.ebuild @@ -19,8 +19,8 @@ fi IUSE="connman networkmanager +ssl" DEPEND=" - sys-libs/zlib ~dev-qt/qtcore-${PV}[debug=] + sys-libs/zlib connman? ( ~dev-qt/qtdbus-${PV}[debug=] ) networkmanager? ( ~dev-qt/qtdbus-${PV}[debug=] ) ssl? ( dev-libs/openssl:0 ) diff --git a/dev-qt/qtnetwork/qtnetwork-5.0.9999.ebuild b/dev-qt/qtnetwork/qtnetwork-5.0.9999.ebuild index 57339099..eb39969a 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.0.9999.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.0.9999.ebuild @@ -19,8 +19,8 @@ fi IUSE="connman networkmanager +ssl" DEPEND=" - sys-libs/zlib ~dev-qt/qtcore-${PV}[debug=] + sys-libs/zlib connman? ( ~dev-qt/qtdbus-${PV}[debug=] ) networkmanager? ( ~dev-qt/qtdbus-${PV}[debug=] ) ssl? ( dev-libs/openssl:0 ) diff --git a/dev-qt/qtnetwork/qtnetwork-5.9999.ebuild b/dev-qt/qtnetwork/qtnetwork-5.9999.ebuild index 57339099..eb39969a 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.9999.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.9999.ebuild @@ -19,8 +19,8 @@ fi IUSE="connman networkmanager +ssl" DEPEND=" - sys-libs/zlib ~dev-qt/qtcore-${PV}[debug=] + sys-libs/zlib connman? ( ~dev-qt/qtdbus-${PV}[debug=] ) networkmanager? ( ~dev-qt/qtdbus-${PV}[debug=] ) ssl? ( dev-libs/openssl:0 ) diff --git a/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild b/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild index eb71497d..ad7bc2f2 100644 --- a/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild +++ b/dev-qt/qtopengl/qtopengl-4.8.9999.ebuild @@ -16,9 +16,9 @@ fi IUSE="egl qt3support" DEPEND=" - virtual/opengl ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=] ~dev-qt/qtgui-${PV}[aqua=,debug=,egl=,qt3support=] + virtual/opengl " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtopengl/qtopengl-5.0.1.ebuild b/dev-qt/qtopengl/qtopengl-5.0.1.ebuild index 8b52a9e3..877ecbd6 100644 --- a/dev-qt/qtopengl/qtopengl-5.0.1.ebuild +++ b/dev-qt/qtopengl/qtopengl-5.0.1.ebuild @@ -19,10 +19,10 @@ fi IUSE="egl" DEPEND=" - virtual/opengl ~dev-qt/qtcore-${PV}[debug=] ~dev-qt/qtgui-${PV}[debug=,egl=,opengl] ~dev-qt/qtwidgets-${PV}[debug=] + virtual/opengl egl? ( media-libs/mesa[egl] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtopengl/qtopengl-5.0.9999.ebuild b/dev-qt/qtopengl/qtopengl-5.0.9999.ebuild index 9000632b..b6512a07 100644 --- a/dev-qt/qtopengl/qtopengl-5.0.9999.ebuild +++ b/dev-qt/qtopengl/qtopengl-5.0.9999.ebuild @@ -19,10 +19,10 @@ fi IUSE="" DEPEND=" - virtual/opengl ~dev-qt/qtcore-${PV}[debug=] ~dev-qt/qtgui-${PV}[debug=,opengl] ~dev-qt/qtwidgets-${PV}[debug=] + virtual/opengl " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtopengl/qtopengl-5.9999.ebuild b/dev-qt/qtopengl/qtopengl-5.9999.ebuild index 9000632b..b6512a07 100644 --- a/dev-qt/qtopengl/qtopengl-5.9999.ebuild +++ b/dev-qt/qtopengl/qtopengl-5.9999.ebuild @@ -19,10 +19,10 @@ fi IUSE="" DEPEND=" - virtual/opengl ~dev-qt/qtcore-${PV}[debug=] ~dev-qt/qtgui-${PV}[debug=,opengl] ~dev-qt/qtwidgets-${PV}[debug=] + virtual/opengl " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild b/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild index fe56909e..a4b314e5 100644 --- a/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild +++ b/dev-qt/qtopenvg/qtopenvg-4.8.9999.ebuild @@ -16,9 +16,9 @@ fi IUSE="qt3support" DEPEND=" - media-libs/mesa[egl,openvg] ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=] ~dev-qt/qtgui-${PV}[aqua=,debug=,egl,qt3support=] + media-libs/mesa[egl,openvg] " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild b/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild index b172fc93..483a3de5 100644 --- a/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild +++ b/dev-qt/qtsvg/qtsvg-4.8.9999.ebuild @@ -16,9 +16,9 @@ fi IUSE="+accessibility" DEPEND=" - sys-libs/zlib ~dev-qt/qtcore-${PV}[aqua=,debug=] ~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=] + sys-libs/zlib " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild index 3dd8619d..9fafba11 100644 --- a/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-4.8.9999.ebuild @@ -18,11 +18,11 @@ IUSE="+gstreamer icu +jit" # libxml2[!icu?] is needed for bugs 407315 and 411091 DEPEND=" dev-db/sqlite:3 - x11-libs/libX11 - x11-libs/libXrender ~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 gstreamer? ( dev-libs/glib:2 dev-libs/libxml2:2[!icu?] diff --git a/dev-qt/qtwebkit/qtwebkit-5.0.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.0.1.ebuild index 58400dcb..97d4cbb5 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.0.1.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.0.1.ebuild @@ -23,6 +23,10 @@ IUSE="gstreamer libxml2 multimedia opengl qml udev webp widgets xslt" RDEPEND=" dev-db/sqlite + ~dev-qt/qtcore-${PV}[debug=,icu] + ~dev-qt/qtgui-${PV}[debug=] + ~dev-qt/qtnetwork-${PV}[debug=] + ~dev-qt/qtsql-${PV}[debug=] media-libs/fontconfig media-libs/libpng:0= sys-libs/zlib @@ -31,10 +35,6 @@ RDEPEND=" x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender - ~dev-qt/qtcore-${PV}[debug=,icu] - ~dev-qt/qtgui-${PV}[debug=] - ~dev-qt/qtnetwork-${PV}[debug=] - ~dev-qt/qtsql-${PV}[debug=] gstreamer? ( dev-libs/glib:2 >=media-libs/gstreamer-0.10.30:0.10 diff --git a/dev-qt/qtwebkit/qtwebkit-5.0.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.0.9999.ebuild index 58400dcb..97d4cbb5 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.0.9999.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.0.9999.ebuild @@ -23,6 +23,10 @@ IUSE="gstreamer libxml2 multimedia opengl qml udev webp widgets xslt" RDEPEND=" dev-db/sqlite + ~dev-qt/qtcore-${PV}[debug=,icu] + ~dev-qt/qtgui-${PV}[debug=] + ~dev-qt/qtnetwork-${PV}[debug=] + ~dev-qt/qtsql-${PV}[debug=] media-libs/fontconfig media-libs/libpng:0= sys-libs/zlib @@ -31,10 +35,6 @@ RDEPEND=" x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender - ~dev-qt/qtcore-${PV}[debug=,icu] - ~dev-qt/qtgui-${PV}[debug=] - ~dev-qt/qtnetwork-${PV}[debug=] - ~dev-qt/qtsql-${PV}[debug=] gstreamer? ( dev-libs/glib:2 >=media-libs/gstreamer-0.10.30:0.10 diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild index 58400dcb..97d4cbb5 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild @@ -23,6 +23,10 @@ IUSE="gstreamer libxml2 multimedia opengl qml udev webp widgets xslt" RDEPEND=" dev-db/sqlite + ~dev-qt/qtcore-${PV}[debug=,icu] + ~dev-qt/qtgui-${PV}[debug=] + ~dev-qt/qtnetwork-${PV}[debug=] + ~dev-qt/qtsql-${PV}[debug=] media-libs/fontconfig media-libs/libpng:0= sys-libs/zlib @@ -31,10 +35,6 @@ RDEPEND=" x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender - ~dev-qt/qtcore-${PV}[debug=,icu] - ~dev-qt/qtgui-${PV}[debug=] - ~dev-qt/qtnetwork-${PV}[debug=] - ~dev-qt/qtsql-${PV}[debug=] gstreamer? ( dev-libs/glib:2 >=media-libs/gstreamer-0.10.30:0.10 |