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

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 119 insertions, 17 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/Manifest b/x11-libs/qtscriptgenerator/Manifest
index f1d7ca31ec08..8af2c7982e01 100644
--- a/x11-libs/qtscriptgenerator/Manifest
+++ b/x11-libs/qtscriptgenerator/Manifest
@@ -1,25 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX qtscriptgenerator-0.1.0-qt48.patch 1484 RMD160 dde7e46099b2fcc0d5308b2a8ef253d6ab192d74 SHA1 5487e2ed1ce4d35b48b3433dc5cc2a1752a03ff1 SHA256 2ba733d1820cbfc4883c0bfae63dead440e61b16fc3595bab9112f5f477d6111
 AUX qtscriptgenerator-gcc44.patch 495 RMD160 7e58d78e23aaf6e89b070941517a0db3cbc45ff4 SHA1 87cd599403fa9bb441ddc27c77e0b6242e2cc150 SHA256 6cc6825725e5746ddbf4f5f4376ce8584cb74643027a84b4eb44c10850a7205a
 DIST qtscriptgenerator-src-0.1.0.tar.gz 374223 RMD160 a02ce6fea2fbc3d3a6ae9e51c6b563ef4bcd51f3 SHA1 eeae733106369e289f257b754822bc372fd6ba75 SHA256 462ec57a65cf61228070a442299a5ecd189f80325f8246e5f98e0b8b06941f41
+EBUILD qtscriptgenerator-0.1.0-r1.ebuild 1844 RMD160 b01011619f4673cc59f980ce99416e784bfe1239 SHA1 476c34edb7d124d279664363a575dae3d31b1bc7 SHA256 afed11f3419cbf33e4e48f0a76bae20c892217138524db035eda22571afa1add
 EBUILD qtscriptgenerator-0.1.0.ebuild 1782 RMD160 807d8876b3c9abd89aacfba0e987d69b53e58af5 SHA1 3ce55c505d835482b7e220b504c8d013dd171401 SHA256 42b2cba0631eada4a9ce10e4b53be399a3f572619884e5e3f49e9807a5bd9d97
-MISC ChangeLog 2301 RMD160 84ade748c2275d71d6982f9776895e963d854ae6 SHA1 60729c15f0b7a3b1c5295a5fa96251896b95bb1a SHA256 90ea2eb187e3fcb477cd9a3d172e89727a03721ad883dfce95258c7ab3486dac
+MISC ChangeLog 2575 RMD160 0f8c6a5ba2b509499619f051664660c13cfdb691 SHA1 a67184d7a80310c5fcbb61bd9bb6265d1e9628ae SHA256 2bf20dbe030f0f6404ea87b2dd5aa816016a0209a29e590316830cf998129694
 MISC metadata.xml 174 RMD160 150ebb914d1d3dba874847502ec6fca3569bdd9d SHA1 069ee757d92149b01569258dd651246ae0c56e88 SHA256 24acedd614ebfee8dfa4f4bbe7729fd1b503351fb7c055fe3ff0109ef01e2a8e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNjhiQAAoJENwGBM22xffeswUP/jdEoP1862xIiNTrXQc7IUSF
-FQal84vsxsmd3et5ieSAQFxZtJM7vwnTUgoHhaPg/dmyVe+JgicM/yKANKqdFQzE
-Qg7Y5wg8qAoYAJgO+/Gc+k7pIvXgH7IA3IgvmzPZg3Y9Xjo3x83ACsdDq2+MPDp8
-KgU03IEPUqw0iAg4FJXhDGV2iRL7rJLdrBXsx1zv3KhGjfnsniremoLZfIWap0Yn
-dX2Kvm1VVqu25P2M69fXnZGMqjViuEj+v+OhUxBbu2n6aMRaX2q7/0zSSj61waxx
-U83sPllawCN/JrXFB0E+JqjP9RiHW71Nn85z2S/ke8wHZxUi6QZjMc5LTlVyUm/a
-EWvLDPiZ0SoRjK/JRG4dv0psPlre0QCDknCJ9wKW75IwLfMRWCSkwSTuf/qbBM4u
-MYof38dLKZtLHY1iZTYf5HA/2Y0IumlPIxSl6ozPVdObKwj/Uaxk7ele4jU37jE8
-LFOwyHCM7mA4y8movqOPPIkRiOIq+iRKlsqdWfvvE3lZHmHiqc7E4lvfbdpHKA9y
-xQKHkYG/DsEHqA/qaCNeSlJO5gobthqQKZ4jG+NEkaQ81z0bBFQtInnUjIeldTnG
-tPKD86JyjemoZBs69NyU3RuMdiodQxbw4xJHlJoK4n2if6f5jQzOffhztYaUKyeJ
-M+ELPQc2Hi67V2RzXqTH
-=3c+p
+iQEcBAEBCgAGBQJPC/+kAAoJEO+t9ga+3I3aGAAIAMb6+CbOfZAga4wNGYHZV2FN
+SKi4tM1YrGFWz+2pb7vuZtARVPu43IOHT65G/lMoLeqk4SdBvsY8QCb6HJOAw78L
+ZKD360Y8yPjs79Xh42UvqhbsYQEx8CCY90zEtf0IkuJGhuFlrS3o/WBTErUV3XGV
+W6QCGo9SASryjbnq3IOg1L3dfCMRjK4x4guDMuROz2eeACNENpA0t72XRxdjXB2F
+ucVftw8x9k1J2DJuEz22kbbcAtfUasXb7F3CnEKPWugGhobCgrHc6Wzav3R9nOsY
+RUB+So+tFBUCiifNlWEWlJpJS9Nxua2kJqaWgHhZrock/CQHwAVkKBqhzYMzNZ8=
+=W8Fa
 -----END PGP SIGNATURE-----
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"
+}