| 1 |
commit: 42f4c2997e8ec0c3e6654d0b2a2a4a76b8051fae |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 27 23:32:00 2014 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 27 23:32:00 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=42f4c299 |
| 7 |
|
| 8 |
[dev-qt/qtgui:4] Cleanups. |
| 9 |
|
| 10 |
Also, don't install qtconfig icon and desktop file if the app is not built. |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.10 |
| 13 |
|
| 14 |
--- |
| 15 |
dev-qt/qtgui/qtgui-4.8.9999.ebuild | 71 +++++++++++++++++++------------------- |
| 16 |
1 file changed, 36 insertions(+), 35 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-qt/qtgui/qtgui-4.8.9999.ebuild b/dev-qt/qtgui/qtgui-4.8.9999.ebuild |
| 19 |
index 66ce32c..044dc03 100644 |
| 20 |
--- a/dev-qt/qtgui/qtgui-4.8.9999.ebuild |
| 21 |
+++ b/dev-qt/qtgui/qtgui-4.8.9999.ebuild |
| 22 |
@@ -77,6 +77,10 @@ QT4_TARGET_DIRECTORIES=" |
| 23 |
src/plugins/imageformats/jpeg |
| 24 |
src/plugins/imageformats/tga |
| 25 |
src/plugins/inputmethods" |
| 26 |
+QT4_EXTRACT_DIRECTORIES=" |
| 27 |
+ include |
| 28 |
+ src |
| 29 |
+ tools/qtconfig" |
| 30 |
|
| 31 |
pkg_setup() { |
| 32 |
use accessibility && QT4_TARGET_DIRECTORIES+=" src/plugins/accessible/widgets" |
| 33 |
@@ -84,12 +88,34 @@ pkg_setup() { |
| 34 |
use tiff && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/tiff" |
| 35 |
use trace && QT4_TARGET_DIRECTORIES+=" src/plugins/graphicssystems/trace tools/qttracereplay" |
| 36 |
|
| 37 |
- # mac version does not contain qtconfig? |
| 38 |
- [[ ${CHOST} == *-darwin* ]] || QT4_TARGET_DIRECTORIES+=" tools/qtconfig" |
| 39 |
+ [[ ${CHOST} != *-darwin* ]] && QT4_TARGET_DIRECTORIES+=" tools/qtconfig" |
| 40 |
|
| 41 |
- QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} |
| 42 |
- include |
| 43 |
- src" |
| 44 |
+ QCONFIG_ADD=" |
| 45 |
+ mitshm tablet x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync |
| 46 |
+ fontconfig system-freetype gif png system-png jpeg system-jpeg |
| 47 |
+ $(usev accessibility) |
| 48 |
+ $(usev cups) |
| 49 |
+ $(use mng && echo system-mng) |
| 50 |
+ $(usev nas) |
| 51 |
+ $(usev nis) |
| 52 |
+ $(use tiff && echo system-tiff) |
| 53 |
+ $(usev xinerama) |
| 54 |
+ $(use xv && echo xvideo)" |
| 55 |
+ QCONFIG_REMOVE="no-freetype no-gif no-jpeg no-png no-gui" |
| 56 |
+ QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY) |
| 57 |
+ $(use cups && echo QT_CUPS) |
| 58 |
+ $(use egl && echo QT_EGL) |
| 59 |
+ QT_FONTCONFIG QT_FREETYPE |
| 60 |
+ $(use gtkstyle && echo QT_STYLE_GTK) |
| 61 |
+ QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG |
| 62 |
+ $(use mng && echo QT_IMAGEFORMAT_MNG) |
| 63 |
+ $(use nas && echo QT_NAS) |
| 64 |
+ $(use nis && echo QT_NIS) |
| 65 |
+ $(use tiff && echo QT_IMAGEFORMAT_TIFF) |
| 66 |
+ QT_SESSIONMANAGER QT_SHAPE QT_TABLET QT_XCURSOR QT_XFIXES |
| 67 |
+ $(use xinerama && echo QT_XINERAMA) |
| 68 |
+ QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC |
| 69 |
+ $(use xv && echo QT_XVIDEO)" |
| 70 |
|
| 71 |
qt4-build-multilib_pkg_setup |
| 72 |
} |
| 73 |
@@ -134,42 +160,17 @@ src_configure() { |
| 74 |
} |
| 75 |
|
| 76 |
src_install() { |
| 77 |
- QCONFIG_ADD=" |
| 78 |
- mitshm tablet x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync |
| 79 |
- fontconfig system-freetype gif png system-png jpeg system-jpeg |
| 80 |
- $(usev accessibility) |
| 81 |
- $(usev cups) |
| 82 |
- $(use mng && echo system-mng) |
| 83 |
- $(usev nas) |
| 84 |
- $(usev nis) |
| 85 |
- $(use tiff && echo system-tiff) |
| 86 |
- $(usev xinerama) |
| 87 |
- $(use xv && echo xvideo)" |
| 88 |
- QCONFIG_REMOVE="no-freetype no-gif no-jpeg no-png no-gui" |
| 89 |
- QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY) |
| 90 |
- $(use cups && echo QT_CUPS) |
| 91 |
- $(use egl && echo QT_EGL) |
| 92 |
- QT_FONTCONFIG QT_FREETYPE |
| 93 |
- $(use gtkstyle && echo QT_STYLE_GTK) |
| 94 |
- QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG |
| 95 |
- $(use mng && echo QT_IMAGEFORMAT_MNG) |
| 96 |
- $(use nas && echo QT_NAS) |
| 97 |
- $(use nis && echo QT_NIS) |
| 98 |
- $(use tiff && echo QT_IMAGEFORMAT_TIFF) |
| 99 |
- QT_SESSIONMANAGER QT_SHAPE QT_TABLET QT_XCURSOR QT_XFIXES |
| 100 |
- $(use xinerama && echo QT_XINERAMA) |
| 101 |
- QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC |
| 102 |
- $(use xv && echo QT_XVIDEO)" |
| 103 |
- |
| 104 |
qt4-build-multilib_src_install |
| 105 |
|
| 106 |
# touch the available graphics systems |
| 107 |
dodir /usr/share/qt4/graphicssystems |
| 108 |
echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die |
| 109 |
- touch "${ED}"/usr/share/qt4/graphicssystems/native || die |
| 110 |
+ echo "" > "${ED}"/usr/share/qt4/graphicssystems/native || die |
| 111 |
|
| 112 |
- newicon tools/qtconfig/images/appicon.png qtconfig.png |
| 113 |
- make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings' |
| 114 |
+ if has tools/qtconfig ${QT4_TARGET_DIRECTORIES}; then |
| 115 |
+ newicon tools/qtconfig/images/appicon.png qtconfig.png |
| 116 |
+ make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings' |
| 117 |
+ fi |
| 118 |
|
| 119 |
# bug 388551 |
| 120 |
if use gtkstyle; then |
Archives