Revision bump. EAPI 4, use qt4-r2 eclass, add fedora patch to compile with Qt 4.8, fixes bug #397917.

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

3 files changed, 108 insertions, 2 deletions

diff --git a/x11-libs/qtscriptgenerator/ChangeLog b/x11-libs/qtscriptgenerator/ChangeLog
index d336c218882f..5fb856b537c0 100644
--- a/x11-libs/qtscriptgenerator/ChangeLog
+++ b/x11-libs/qtscriptgenerator/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/qtscriptgenerator
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/ChangeLog,v 1.13 2011/03/26 16:46:57 dilfridge Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/ChangeLog,v 1.14 2012/01/10 09:07:20 johu Exp $
+
+*qtscriptgenerator-0.1.0-r1 (10 Jan 2012)
+
+  10 Jan 2012; Johannes Huber <johu@gentoo.org>
+  +files/qtscriptgenerator-0.1.0-qt48.patch, +qtscriptgenerator-0.1.0-r1.ebuild:
+  Revision bump. EAPI 4, use qt4-r2 eclass, add fedora patch to compile with Qt
+  4.8, fixes bug #397917.
 
   26 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   qtscriptgenerator-0.1.0.ebuild:
diff --git a/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.1.0-qt48.patch b/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.1.0-qt48.patch
new file mode 100644
index 000000000000..f397b5ab13bc
--- /dev/null
+++ b/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.1.0-qt48.patch
@@ -0,0 +1,22 @@
+diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml
+--- qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent	2011-12-22 11:34:52.615149619 -0600
++++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml	2011-12-22 11:35:31.808659632 -0600
+@@ -2233,7 +2233,6 @@
+     
+                
+   </object-type>
+-  <object-type name="QFileOpenEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::FileOpen"/>
+   <object-type name="QFocusEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::FocusIn || %1-&gt;type() == QEvent::FocusOut">
+         <modify-function signature="reason()const">
+             <remove/>
+diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml
+--- qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml.no_QFileOpenEvent	2009-02-20 05:42:24.000000000 -0600
++++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml	2011-12-22 11:33:43.058019203 -0600
+@@ -2555,7 +2555,6 @@
+     
+                
+   </object-type>
+-  <object-type name="QFileOpenEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::FileOpen"/>
+   <object-type name="QFocusEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::FocusIn || %1-&gt;type() == QEvent::FocusOut">
+         <modify-function signature="reason()const">
+             <remove/>
diff --git a/x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0-r1.ebuild b/x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0-r1.ebuild
new file mode 100644
index 000000000000..76620a872cb7
--- /dev/null
+++ b/x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0-r1.ebuild,v 1.1 2012/01/10 09:07:20 johu Exp $
+
+EAPI=4
+
+MY_PN="${PN}-src"
+MY_P="${MY_PN}-${PV}"
+
+inherit multilib qt4-r2
+
+DESCRIPTION="Tool for generating Qt bindings for Qt Script"
+HOMEPAGE="http://code.google.com/p/qtscriptgenerator/"
+SRC_URI="http://qtscriptgenerator.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug kde"
+
+DEPEND="
+	x11-libs/qt-dbus:4
+	x11-libs/qt-gui:4
+	x11-libs/qt-opengl:4
+	!kde? ( || (
+		x11-libs/qt-phonon:4
+		media-libs/phonon
+	) )
+	kde? ( media-libs/phonon )
+	x11-libs/qt-script:4
+	x11-libs/qt-sql:4
+	x11-libs/qt-svg:4
+	x11-libs/qt-webkit:4
+	x11-libs/qt-xmlpatterns:4
+"
+RDEPEND="${DEPEND}"
+
+PLUGINS="core gui network opengl sql svg uitools webkit xml xmlpatterns"
+
+S="${WORKDIR}/${MY_P}"
+
+# Fix for GCC-4.4 (bug 268086), Qt 4.8 (bug 397917)
+PATCHES=(
+	"${FILESDIR}/${PN}-gcc44.patch"
+	"${FILESDIR}/${P}-qt48.patch"
+)
+
+src_prepare() {
+	# remove phonon
+	sed -i "/typesystem_phonon.xml/d" generator/generator.qrc || die "sed failed"
+	sed -i "/qtscript_phonon/d" qtbindings/qtbindings.pro || die "sed failed"
+
+	qt4-r2_src_prepare
+}
+
+src_configure() {
+	cd "${S}"/generator
+	eqmake4 generator.pro
+	cd "${S}"/qtbindings
+	eqmake4 qtbindings.pro
+}
+
+src_compile() {
+	# use only one job for compilation wrt bug 274458
+	cd "${S}"/generator
+	emake -j1 || die "make generator failed"
+	./generator --include-paths="/usr/include/qt4/" || die "running generator failed"
+
+	cd "${S}"/qtbindings
+	emake -j1 || die "make qtbindings failed"
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/qt4/plugins/script/
+	insopts -m0755
+	doins -r "${S}"/plugins/script/*.so || die "doins failed"
+}