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

[Alex Alexander (wired)]

wired       10/10/09 20:26:39

  Modified:             qt-assistant-4.7.0.ebuild ChangeLog metadata.xml
  Log:
  added optional compatibility package support
  
  (Portage version: 2.2_rc89/cvs/Linux x86_64)

Revision  Changes    Path
1.5                  x11-libs/qt-assistant/qt-assistant-4.7.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.7.0.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.7.0.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.7.0.ebuild?r1=1.4&r2=1.5

Index: qt-assistant-4.7.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.7.0.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qt-assistant-4.7.0.ebuild	9 Oct 2010 16:50:05 -0000	1.4
+++ qt-assistant-4.7.0.ebuild	9 Oct 2010 20:26:38 -0000	1.5
@@ -1,6 +1,6 @@
 # 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.7.0.ebuild,v 1.4 2010/10/09 16:50:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.7.0.ebuild,v 1.5 2010/10/09 20:26:38 wired Exp $
 
 EAPI="3"
 inherit qt4-build
@@ -8,7 +8,8 @@
 DESCRIPTION="The assistant help module for the Qt toolkit"
 SLOT="4"
 KEYWORDS="~amd64 ~arm ~ia64 ~x86"
-IUSE="doc +glib trace"
+IUSE="compat doc +glib trace"
+SRC_URI+=" compat? ( ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz )"
 
 DEPEND="~x11-libs/qt-gui-${PV}[aqua=,glib=,trace?]
 	~x11-libs/qt-sql-${PV}[aqua=,sqlite]
@@ -38,6 +39,27 @@
 	qt4-build_pkg_setup
 }
 
+src_unpack() {
+	qt4-build_src_unpack
+	# compat version
+	# http://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
+	if use compat; then
+		unpack "${PN}"-qassistantclient-library-compat-src-4.6.3.tar.gz
+		mv "${WORKDIR}"/"${PN}"-qassistantclient-library-compat-version-4.6.3 \
+			"${S}"/tools/assistant/compat ||
+				die "moving compat to the right place failed"
+		tar xzf "${FILESDIR}"/"${PN}"-4.7-include.tar.gz -C "${S}"/include/ ||
+			die "unpacking the include files failed"
+	fi
+}
+
+src_prepare() {
+	qt4-build_src_prepare
+	if use compat; then
+		epatch "${FILESDIR}"/"${PN}"-4.7-fix-compat.patch
+	fi
+}
+
 src_configure() {
 	myconf="${myconf} -no-xkb -no-fontconfig -no-xrender -no-xrandr
 		-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
@@ -85,4 +107,9 @@
 	make_desktop_entry "${EPREFIX}"/usr/bin/assistant Assistant \
 		"${EPREFIX}"/usr/share/pixmaps/assistant.png 'Qt;Development;GUIDesigner' ||
 			die "make_desktop_entry failed"
+
+	if use compat; then
+		insinto /usr/share/qt4/mkspecs/features || die "insinto failed"
+		doins tools/assistant/compat/features/assistant.prf || die "doins failed"
+	fi
 }



1.90                 x11-libs/qt-assistant/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/ChangeLog?rev=1.90&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/ChangeLog?rev=1.90&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/ChangeLog?r1=1.89&r2=1.90

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- ChangeLog	9 Oct 2010 16:50:20 -0000	1.89
+++ ChangeLog	9 Oct 2010 20:26:38 -0000	1.90
@@ -1,6 +1,11 @@
 # 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.89 2010/10/09 16:50:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.90 2010/10/09 20:26:38 wired Exp $
+
+  09 Oct 2010; Alex Alexander <wired@g.o> qt-assistant-4.7.0.ebuild,
+  +files/qt-assistant-4.7-fix-compat.patch,
+  +files/qt-assistant-4.7-include.tar.gz, metadata.xml:
+  added optional compatibility package support
 
   09 Oct 2010; Raúl Porcel <armin76@g.o> qt-assistant-4.7.0.ebuild:
   Add ~ia64 wrt #338289



1.8                  x11-libs/qt-assistant/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/metadata.xml?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/metadata.xml?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/metadata.xml?r1=1.7&r2=1.8

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/metadata.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- metadata.xml	21 Sep 2010 14:37:38 -0000	1.7
+++ metadata.xml	9 Oct 2010 20:26:38 -0000	1.8
@@ -3,6 +3,9 @@
 <pkgmetadata>
 	<herd>qt</herd>
 	<use>
+		<flag name='compat'>Build the extra compatibility package required by
+		a few packages. More information at
+		http://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/</flag>
 		<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