[gentoo-commits] gentoo-x86 commit in x11-libs/qt-assistant: metadata.xml ChangeLog qt-assistant-4.6.2-r1.ebuild

[Markos Chandras (hwoarang)]

hwoarang    10/05/01 18:21:41

  Modified:             metadata.xml ChangeLog
  Added:                qt-assistant-4.6.2-r1.ebuild
  Log:
  Add trace use flag to build qttracereplay utility. Fixes bug #317802
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.6                  x11-libs/qt-assistant/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/metadata.xml?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/metadata.xml?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/metadata.xml?r1=1.5&r2=1.6

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/metadata.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- metadata.xml	18 Feb 2010 00:06:53 -0000	1.5
+++ metadata.xml	1 May 2010 18:21:41 -0000	1.6
@@ -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>



1.76                 x11-libs/qt-assistant/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/ChangeLog?rev=1.76&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/ChangeLog?rev=1.76&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/ChangeLog?r1=1.75&r2=1.76

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- ChangeLog	18 Apr 2010 13:07:14 -0000	1.75
+++ ChangeLog	1 May 2010 18:21:41 -0000	1.76
@@ -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@g.o>
+  +qt-assistant-4.6.2-r1.ebuild, metadata.xml:
+  Add trace use flag to build qttracereplay utility. Fixes bug #317802
 
   18 Apr 2010; <nixnut@g.o> qt-assistant-4.6.2.ebuild:
   ppc stable #297299



1.1                  x11-libs/qt-assistant/qt-assistant-4.6.2-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.2-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.2-r1.ebuild?rev=1.1&content-type=text/plain

Index: qt-assistant-4.6.2-r1.ebuild
===================================================================
# 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"
}