From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (unknown [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2AFD81381FA for ; Wed, 28 May 2014 00:31:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7C2F2E085E; Wed, 28 May 2014 00:31:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D67B6E085E for ; Wed, 28 May 2014 00:31:56 +0000 (UTC) Received: from spoonbill.gentoo.org (unknown [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AE25D33F874 for ; Wed, 28 May 2014 00:31:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 51DC4181A9 for ; Wed, 28 May 2014 00:31:54 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1401233520.42f4c2997e8ec0c3e6654d0b2a2a4a76b8051fae.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtgui/qtgui-4.8.9999.ebuild X-VCS-Directories: dev-qt/qtgui/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 42f4c2997e8ec0c3e6654d0b2a2a4a76b8051fae X-VCS-Branch: master Date: Wed, 28 May 2014 00:31:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 68ab8d9e-8a65-49c8-8a4c-1f2ab2f26f00 X-Archives-Hash: c4f2b53fdad3a82fe4484da92652dee3 commit: 42f4c2997e8ec0c3e6654d0b2a2a4a76b8051fae Author: Davide Pesavento gentoo org> AuthorDate: Tue May 27 23:32:00 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Tue May 27 23:32:00 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=42f4c299 [dev-qt/qtgui:4] Cleanups. Also, don't install qtconfig icon and desktop file if the app is not built. Package-Manager: portage-2.2.10 --- dev-qt/qtgui/qtgui-4.8.9999.ebuild | 71 +++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/dev-qt/qtgui/qtgui-4.8.9999.ebuild b/dev-qt/qtgui/qtgui-4.8.9999.ebuild index 66ce32c..044dc03 100644 --- a/dev-qt/qtgui/qtgui-4.8.9999.ebuild +++ b/dev-qt/qtgui/qtgui-4.8.9999.ebuild @@ -77,6 +77,10 @@ QT4_TARGET_DIRECTORIES=" src/plugins/imageformats/jpeg src/plugins/imageformats/tga src/plugins/inputmethods" +QT4_EXTRACT_DIRECTORIES=" + include + src + tools/qtconfig" pkg_setup() { use accessibility && QT4_TARGET_DIRECTORIES+=" src/plugins/accessible/widgets" @@ -84,12 +88,34 @@ pkg_setup() { use tiff && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/tiff" use trace && QT4_TARGET_DIRECTORIES+=" src/plugins/graphicssystems/trace tools/qttracereplay" - # mac version does not contain qtconfig? - [[ ${CHOST} == *-darwin* ]] || QT4_TARGET_DIRECTORIES+=" tools/qtconfig" + [[ ${CHOST} != *-darwin* ]] && QT4_TARGET_DIRECTORIES+=" tools/qtconfig" - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} - include - src" + QCONFIG_ADD=" + mitshm tablet x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync + fontconfig system-freetype gif png system-png jpeg system-jpeg + $(usev accessibility) + $(usev cups) + $(use mng && echo system-mng) + $(usev nas) + $(usev nis) + $(use tiff && echo system-tiff) + $(usev xinerama) + $(use xv && echo xvideo)" + QCONFIG_REMOVE="no-freetype no-gif no-jpeg no-png no-gui" + QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY) + $(use cups && echo QT_CUPS) + $(use egl && echo QT_EGL) + QT_FONTCONFIG QT_FREETYPE + $(use gtkstyle && echo QT_STYLE_GTK) + QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG + $(use mng && echo QT_IMAGEFORMAT_MNG) + $(use nas && echo QT_NAS) + $(use nis && echo QT_NIS) + $(use tiff && echo QT_IMAGEFORMAT_TIFF) + QT_SESSIONMANAGER QT_SHAPE QT_TABLET QT_XCURSOR QT_XFIXES + $(use xinerama && echo QT_XINERAMA) + QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC + $(use xv && echo QT_XVIDEO)" qt4-build-multilib_pkg_setup } @@ -134,42 +160,17 @@ src_configure() { } src_install() { - QCONFIG_ADD=" - mitshm tablet x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync - fontconfig system-freetype gif png system-png jpeg system-jpeg - $(usev accessibility) - $(usev cups) - $(use mng && echo system-mng) - $(usev nas) - $(usev nis) - $(use tiff && echo system-tiff) - $(usev xinerama) - $(use xv && echo xvideo)" - QCONFIG_REMOVE="no-freetype no-gif no-jpeg no-png no-gui" - QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY) - $(use cups && echo QT_CUPS) - $(use egl && echo QT_EGL) - QT_FONTCONFIG QT_FREETYPE - $(use gtkstyle && echo QT_STYLE_GTK) - QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG - $(use mng && echo QT_IMAGEFORMAT_MNG) - $(use nas && echo QT_NAS) - $(use nis && echo QT_NIS) - $(use tiff && echo QT_IMAGEFORMAT_TIFF) - QT_SESSIONMANAGER QT_SHAPE QT_TABLET QT_XCURSOR QT_XFIXES - $(use xinerama && echo QT_XINERAMA) - QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC - $(use xv && echo QT_XVIDEO)" - qt4-build-multilib_src_install # touch the available graphics systems dodir /usr/share/qt4/graphicssystems echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die - touch "${ED}"/usr/share/qt4/graphicssystems/native || die + echo "" > "${ED}"/usr/share/qt4/graphicssystems/native || die - newicon tools/qtconfig/images/appicon.png qtconfig.png - make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings' + if has tools/qtconfig ${QT4_TARGET_DIRECTORIES}; then + newicon tools/qtconfig/images/appicon.png qtconfig.png + make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings' + fi # bug 388551 if use gtkstyle; then