| 1 |
commit: f7586925c7d41325adcebcbdccdde69b04e0d563 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 1 23:26:36 2014 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 1 23:26:36 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f7586925 |
| 7 |
|
| 8 |
[dev-qt/qtgui:4] Raise minimum deps to ensure correct multilib USE deps. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.12-r1 |
| 11 |
|
| 12 |
--- |
| 13 |
dev-qt/qtgui/qtgui-4.8.6.ebuild | 46 +++++++++++++++++++------------------- |
| 14 |
dev-qt/qtgui/qtgui-4.8.9999.ebuild | 46 +++++++++++++++++++------------------- |
| 15 |
2 files changed, 46 insertions(+), 46 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-qt/qtgui/qtgui-4.8.6.ebuild b/dev-qt/qtgui/qtgui-4.8.6.ebuild |
| 18 |
index ed74f5d..825f89b 100644 |
| 19 |
--- a/dev-qt/qtgui/qtgui-4.8.6.ebuild |
| 20 |
+++ b/dev-qt/qtgui/qtgui-4.8.6.ebuild |
| 21 |
@@ -26,42 +26,42 @@ RDEPEND=" |
| 22 |
app-admin/eselect-qtgraphicssystem |
| 23 |
~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=,${MULTILIB_USEDEP}] |
| 24 |
~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] |
| 25 |
- media-libs/fontconfig[${MULTILIB_USEDEP}] |
| 26 |
- media-libs/freetype:2[${MULTILIB_USEDEP}] |
| 27 |
+ >=media-libs/fontconfig-2.10.2-r1[${MULTILIB_USEDEP}] |
| 28 |
+ >=media-libs/freetype-2.4.11-r1:2[${MULTILIB_USEDEP}] |
| 29 |
media-libs/libpng:0=[${MULTILIB_USEDEP}] |
| 30 |
- sys-libs/zlib[${MULTILIB_USEDEP}] |
| 31 |
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
| 32 |
virtual/jpeg:0[${MULTILIB_USEDEP}] |
| 33 |
!aqua? ( |
| 34 |
- x11-libs/libICE[${MULTILIB_USEDEP}] |
| 35 |
- x11-libs/libSM[${MULTILIB_USEDEP}] |
| 36 |
- x11-libs/libX11[${MULTILIB_USEDEP}] |
| 37 |
- x11-libs/libXcursor[${MULTILIB_USEDEP}] |
| 38 |
- x11-libs/libXext[${MULTILIB_USEDEP}] |
| 39 |
- x11-libs/libXfixes[${MULTILIB_USEDEP}] |
| 40 |
- x11-libs/libXi[${MULTILIB_USEDEP}] |
| 41 |
- x11-libs/libXrandr[${MULTILIB_USEDEP}] |
| 42 |
- x11-libs/libXrender[${MULTILIB_USEDEP}] |
| 43 |
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) |
| 44 |
- xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] ) |
| 45 |
+ >=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}] |
| 46 |
+ >=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}] |
| 47 |
+ >=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}] |
| 48 |
+ >=x11-libs/libXcursor-1.1.13-r1[${MULTILIB_USEDEP}] |
| 49 |
+ >=x11-libs/libXext-1.3.1-r1[${MULTILIB_USEDEP}] |
| 50 |
+ >=x11-libs/libXfixes-5.0-r1[${MULTILIB_USEDEP}] |
| 51 |
+ >=x11-libs/libXi-1.6.2-r1[${MULTILIB_USEDEP}] |
| 52 |
+ >=x11-libs/libXrandr-1.4.0-r1[${MULTILIB_USEDEP}] |
| 53 |
+ >=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}] |
| 54 |
+ xinerama? ( >=x11-libs/libXinerama-1.1.2-r1[${MULTILIB_USEDEP}] ) |
| 55 |
+ xv? ( >=x11-libs/libXv-1.0.7-r1[${MULTILIB_USEDEP}] ) |
| 56 |
) |
| 57 |
cups? ( net-print/cups[${MULTILIB_USEDEP}] ) |
| 58 |
egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] ) |
| 59 |
glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) |
| 60 |
gtkstyle? ( |
| 61 |
- x11-libs/cairo[-qt4,${MULTILIB_USEDEP}] |
| 62 |
- x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}] |
| 63 |
+ >=x11-libs/cairo-1.12[-qt4,${MULTILIB_USEDEP}] |
| 64 |
+ >=x11-libs/gtk+-2.24.23-r1:2[aqua=,${MULTILIB_USEDEP}] |
| 65 |
) |
| 66 |
- mng? ( >=media-libs/libmng-1.0.9:=[${MULTILIB_USEDEP}] ) |
| 67 |
- nas? ( >=media-libs/nas-1.5[${MULTILIB_USEDEP}] ) |
| 68 |
- tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) |
| 69 |
+ mng? ( >=media-libs/libmng-1.0.10-r2:=[${MULTILIB_USEDEP}] ) |
| 70 |
+ nas? ( >=media-libs/nas-1.9.3-r1[${MULTILIB_USEDEP}] ) |
| 71 |
+ tiff? ( >=media-libs/tiff-4.0.3-r2:0[${MULTILIB_USEDEP}] ) |
| 72 |
!<dev-qt/qthelp-4.8.5:4 |
| 73 |
" |
| 74 |
DEPEND="${RDEPEND} |
| 75 |
!aqua? ( |
| 76 |
- x11-proto/inputproto[${MULTILIB_USEDEP}] |
| 77 |
- x11-proto/xextproto[${MULTILIB_USEDEP}] |
| 78 |
- xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] ) |
| 79 |
- xv? ( x11-proto/videoproto[${MULTILIB_USEDEP}] ) |
| 80 |
+ >=x11-proto/inputproto-2.2-r1[${MULTILIB_USEDEP}] |
| 81 |
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] |
| 82 |
+ xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] ) |
| 83 |
+ xv? ( >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}] ) |
| 84 |
) |
| 85 |
" |
| 86 |
PDEPEND=" |
| 87 |
|
| 88 |
diff --git a/dev-qt/qtgui/qtgui-4.8.9999.ebuild b/dev-qt/qtgui/qtgui-4.8.9999.ebuild |
| 89 |
index e4f0746..fc19528 100644 |
| 90 |
--- a/dev-qt/qtgui/qtgui-4.8.9999.ebuild |
| 91 |
+++ b/dev-qt/qtgui/qtgui-4.8.9999.ebuild |
| 92 |
@@ -26,42 +26,42 @@ RDEPEND=" |
| 93 |
app-admin/eselect-qtgraphicssystem |
| 94 |
~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=,${MULTILIB_USEDEP}] |
| 95 |
~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] |
| 96 |
- media-libs/fontconfig[${MULTILIB_USEDEP}] |
| 97 |
- media-libs/freetype:2[${MULTILIB_USEDEP}] |
| 98 |
+ >=media-libs/fontconfig-2.10.2-r1[${MULTILIB_USEDEP}] |
| 99 |
+ >=media-libs/freetype-2.4.11-r1:2[${MULTILIB_USEDEP}] |
| 100 |
media-libs/libpng:0=[${MULTILIB_USEDEP}] |
| 101 |
- sys-libs/zlib[${MULTILIB_USEDEP}] |
| 102 |
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
| 103 |
virtual/jpeg:0[${MULTILIB_USEDEP}] |
| 104 |
!aqua? ( |
| 105 |
- x11-libs/libICE[${MULTILIB_USEDEP}] |
| 106 |
- x11-libs/libSM[${MULTILIB_USEDEP}] |
| 107 |
- x11-libs/libX11[${MULTILIB_USEDEP}] |
| 108 |
- x11-libs/libXcursor[${MULTILIB_USEDEP}] |
| 109 |
- x11-libs/libXext[${MULTILIB_USEDEP}] |
| 110 |
- x11-libs/libXfixes[${MULTILIB_USEDEP}] |
| 111 |
- x11-libs/libXi[${MULTILIB_USEDEP}] |
| 112 |
- x11-libs/libXrandr[${MULTILIB_USEDEP}] |
| 113 |
- x11-libs/libXrender[${MULTILIB_USEDEP}] |
| 114 |
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) |
| 115 |
- xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] ) |
| 116 |
+ >=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}] |
| 117 |
+ >=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}] |
| 118 |
+ >=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}] |
| 119 |
+ >=x11-libs/libXcursor-1.1.13-r1[${MULTILIB_USEDEP}] |
| 120 |
+ >=x11-libs/libXext-1.3.1-r1[${MULTILIB_USEDEP}] |
| 121 |
+ >=x11-libs/libXfixes-5.0-r1[${MULTILIB_USEDEP}] |
| 122 |
+ >=x11-libs/libXi-1.6.2-r1[${MULTILIB_USEDEP}] |
| 123 |
+ >=x11-libs/libXrandr-1.4.0-r1[${MULTILIB_USEDEP}] |
| 124 |
+ >=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}] |
| 125 |
+ xinerama? ( >=x11-libs/libXinerama-1.1.2-r1[${MULTILIB_USEDEP}] ) |
| 126 |
+ xv? ( >=x11-libs/libXv-1.0.7-r1[${MULTILIB_USEDEP}] ) |
| 127 |
) |
| 128 |
cups? ( net-print/cups[${MULTILIB_USEDEP}] ) |
| 129 |
egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] ) |
| 130 |
glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) |
| 131 |
gtkstyle? ( |
| 132 |
- x11-libs/cairo[-qt4,${MULTILIB_USEDEP}] |
| 133 |
- x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}] |
| 134 |
+ >=x11-libs/cairo-1.12[-qt4,${MULTILIB_USEDEP}] |
| 135 |
+ >=x11-libs/gtk+-2.24.23-r1:2[aqua=,${MULTILIB_USEDEP}] |
| 136 |
) |
| 137 |
- mng? ( >=media-libs/libmng-1.0.9:=[${MULTILIB_USEDEP}] ) |
| 138 |
- nas? ( >=media-libs/nas-1.5[${MULTILIB_USEDEP}] ) |
| 139 |
- tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) |
| 140 |
+ mng? ( >=media-libs/libmng-1.0.10-r2:=[${MULTILIB_USEDEP}] ) |
| 141 |
+ nas? ( >=media-libs/nas-1.9.3-r1[${MULTILIB_USEDEP}] ) |
| 142 |
+ tiff? ( >=media-libs/tiff-4.0.3-r2:0[${MULTILIB_USEDEP}] ) |
| 143 |
!<dev-qt/qthelp-4.8.5:4 |
| 144 |
" |
| 145 |
DEPEND="${RDEPEND} |
| 146 |
!aqua? ( |
| 147 |
- x11-proto/inputproto[${MULTILIB_USEDEP}] |
| 148 |
- x11-proto/xextproto[${MULTILIB_USEDEP}] |
| 149 |
- xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] ) |
| 150 |
- xv? ( x11-proto/videoproto[${MULTILIB_USEDEP}] ) |
| 151 |
+ >=x11-proto/inputproto-2.2-r1[${MULTILIB_USEDEP}] |
| 152 |
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] |
| 153 |
+ xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] ) |
| 154 |
+ xv? ( >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}] ) |
| 155 |
) |
| 156 |
" |
| 157 |
PDEPEND=" |
Archives