Add trace use flag to build qttracereplay utility. Fixes bug #317802

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/x11-libs/qt-assistant/ChangeLog b/x11-libs/qt-assistant/ChangeLog
index 1235fab4d27b8b05afd69963c10ab851f354ce1b..1c836a21aefee3896970bbf91718f3bcfef77478 100644 (file)
--- a/x11-libs/qt-assistant/ChangeLog
+++ b/x11-libs/qt-assistant/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt-assistant
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.75 2010/04/18 13:07:14 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.76 2010/05/01 18:21:41 hwoarang Exp $
+
+*qt-assistant-4.6.2-r1 (01 May 2010)
+
+  01 May 2010; Markos Chandras <hwoarang@gentoo.org>
+  +qt-assistant-4.6.2-r1.ebuild, metadata.xml:
+  Add trace use flag to build qttracereplay utility. Fixes bug #317802
 
   18 Apr 2010; <nixnut@gentoo.org> qt-assistant-4.6.2.ebuild:
   ppc stable #297299

diff --git a/x11-libs/qt-assistant/Manifest b/x11-libs/qt-assistant/Manifest
index 351548336271d076683d4c4187d990432a4bd7f3..14aaa7065a0ab370930df6b31c6b46088370ec7b 100644 (file)
--- a/x11-libs/qt-assistant/Manifest
+++ b/x11-libs/qt-assistant/Manifest
@@ -4,6 +4,7 @@ DIST qt-everywhere-opensource-src-4.6.2.tar.gz 160601949 RMD160 5f3fea120f2dba27
 DIST qt-x11-opensource-src-4.5.3.tar.gz 125384668 RMD160 93d765ecf89ed15668a4eedc7d77c2a2e41424a2 SHA1 78620ffd03c83c4d86f5039ccf7b09e5c709ed25 SHA256 0c87fc42825d3556970db4412257c6874e716ac3bc45e6f273924d5d6a089aa6
 EBUILD qt-assistant-4.5.3.ebuild 1948 RMD160 4518902a30f64365f1f294fe6a956e84c6b5870b SHA1 b4000b63138416ddc29302d0d5a7eeefb5996f70 SHA256 156175ff19b90f552ce919a9e43c7b9ebe91e46b43f684b9747d33271822cf03
 EBUILD qt-assistant-4.6.1.ebuild 2562 RMD160 14d8885c5edc7b25e50b908a8afca8b73221b149 SHA1 05ae2eb5244b0f51c9fa3d7f5870928d4d7791fc SHA256 c12187f053c12d3dd55927d4cf53a16a2150665d0ce99c6e8ae9be96bff40cff
+EBUILD qt-assistant-4.6.2-r1.ebuild 2767 RMD160 99451a022ef8c427b57c5c2664a40aa3a4de661f SHA1 f894bf5b837ced8d7c6f27dcccbd59707f6afb50 SHA256 7eed4272ebb846edc78d37089ec713db9ba421d41111303b924ddcefdde7f473
 EBUILD qt-assistant-4.6.2.ebuild 2567 RMD160 81cf2642b4a18592ae1447aea7a7f9de0b0ab2d5 SHA1 2cdbb3b7ecd4d009437ad5e88bf5a500830508fc SHA256 0fd6558566b26cb1574fd174c99432973a17a8b710c2fbb2efcb86fbef01ed46
-MISC ChangeLog 10236 RMD160 72947716bff07baaa5cea3a2133c89690a602b27 SHA1 791aa12bb210b4cd3732314f40a20d70bf994193 SHA256 4247ed40f1a4500cdd8c15354bb5d77276172cf837b79230382874fda60fd55a
-MISC metadata.xml 299 RMD160 718016938b3ee545e258cb06754422d2b3af8265 SHA1 43c0db7ac2eaf280eb9eb76be8a53bff2b7c918c SHA256 a9acd5115b751c900f419a834a516327fcd0d7638d955c5153f48ad15bd6bf7e
+MISC ChangeLog 10448 RMD160 acced70a0a614e54005eae0e47fe4de92d172504 SHA1 1ea9f07e3af012ab88ff0ae37a61a8bb0f4e1081 SHA256 fa6c6ffb75beb6900511a143eacdd37f800ff2614122a46157726efc3cfddf16
+MISC metadata.xml 446 RMD160 f2349ee236a499cf4f214aa0fbae5c49b8d521a8 SHA1 21e50e088724d4e0a1548ae08e229a71435e439a SHA256 c1d5995283f983bcef7089584da8edbfe88406456c32e9bf3e8288f829a2986f

diff --git a/x11-libs/qt-assistant/metadata.xml b/x11-libs/qt-assistant/metadata.xml
index a78f8d6b7a75cb4976677279c81f1462bb4aed94..26c910d4e964b72fe7c03879ce060ecde7605cfc 100644 (file)
--- a/x11-libs/qt-assistant/metadata.xml
+++ b/x11-libs/qt-assistant/metadata.xml
@@ -5,5 +5,9 @@
        <use>
                <flag name='exceptions'>Add support for exceptions - like catching them
                inside the event loop (recommended by Nokia)</flag>
+       <flag name='trace'>
+               Build the qttracereplay utility which is required to play drawings
+               recorded with the trace graphicssystem engine
+       </flag>
        </use>
 </pkgmetadata>

diff --git a/x11-libs/qt-assistant/qt-assistant-4.6.2-r1.ebuild b/x11-libs/qt-assistant/qt-assistant-4.6.2-r1.ebuild
new file mode 100644 (file)
index 0000000..e1f1c6c
--- /dev/null
+++ b/x11-libs/qt-assistant/qt-assistant-4.6.2-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.2-r1.ebuild,v 1.1 2010/05/01 18:21:41 hwoarang Exp $
+
+EAPI="2"
+inherit qt4-build
+
+DESCRIPTION="The assistant help module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="trace"
+
+DEPEND="~x11-libs/qt-gui-${PV}[aqua=,trace?]
+       ~x11-libs/qt-sql-${PV}[aqua=,sqlite]
+       ~x11-libs/qt-webkit-${PV}[aqua=]"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-4.6.1-tools.patch" )
+
+# Pixeltool isn't really assistant related, but it relies on
+# the assistant libraries. doc/qch/
+QT4_TARGET_DIRECTORIES="
+tools/assistant
+tools/pixeltool
+tools/qdoc3"
+QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+tools/
+demos/
+examples/
+src/
+include/
+doc/"
+
+pkg_setup() {
+       use trace && QT4_TARGET_DIRECTORIES="tools/qttracereplay"
+       QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+               ${QT4_EXTRACT_DIRECTORIES}"
+       qt4-build_pkg_setup
+}
+
+src_configure() {
+       myconf="${myconf} -no-xkb -no-fontconfig -no-xrender -no-xrandr
+               -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
+               -no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng
+               -no-libmng -no-libjpeg -no-openssl -system-zlib -no-phonon
+               -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility
+               -no-fontconfig -no-glib -no-multimedia -no-qt3support -no-svg"
+       qt4-build_src_configure
+}
+
+src_compile() {
+       # help libQtHelp find freshly built libQtCLucene (bug #289811)
+       export LD_LIBRARY_PATH="${S}/lib"
+       export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework"
+       qt4-build_src_compile
+       # ugly hack to build docs
+       cd "${S}"
+       qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die "qmake projects faied"
+       emake qch_docs || die "emake docs failed"
+}
+
+src_install() {
+       qt4-build_src_install
+       # install documentation
+       # note that emake install_qchdocs fails for undefined reason so we use a
+       # workaround
+       cd "${S}"
+       insinto ${QTDOCDIR#${EPREFIX}}
+       doins -r "${S}"/doc/qch || die "doins qch documentation failed"
+       dobin "${S}"/bin/qdoc3 || die "Installing qdoc3 failed"
+       #emake INSTALL_ROOT="${D}" install_qchdocs || die "emake install_qchdocs        failed"
+       # install correct assistant icon, bug 241208
+       dodir /usr/share/pixmaps/ || die "dodir failed"
+       insinto /usr/share/pixmaps/ || die "insinto failed"
+       doins tools/assistant/tools/assistant/images/assistant.png \
+               || die "doins failed"
+       # Note: absolute image path required here!
+       make_desktop_entry /usr/bin/assistant Assistant \
+               /usr/share/pixmaps/assistant.png 'Qt;Development;GUIDesigner' \
+                       || die "make_desktop_entry failed"
+}