x11-libs/qtscriptgenerator - dropped qt-dbus deps, added qt-webkit deps (thx jefferai)

5 files changed, 122 insertions, 4 deletions

diff --git a/x11-libs/qtscriptgenerator/ChangeLog b/x11-libs/qtscriptgenerator/ChangeLog
index d95a311d87..a5f2218fc0 100644
--- a/x11-libs/qtscriptgenerator/ChangeLog
+++ b/x11-libs/qtscriptgenerator/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 May 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+  qtscriptgenerator-9999.ebuild:
+  Dropped qt-dbus deps, added qt-webkit deps
+
   15 Apr 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   -x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0.ebuild:
   Removed qtscript-0.1.0 as it was added to the tree.
diff --git a/x11-libs/qtscriptgenerator/Manifest b/x11-libs/qtscriptgenerator/Manifest
index 11c0c16fc7..90a6047282 100644
--- a/x11-libs/qtscriptgenerator/Manifest
+++ b/x11-libs/qtscriptgenerator/Manifest
@@ -1,3 +1,6 @@
-EBUILD qtscriptgenerator-9999.ebuild 1513 RMD160 0373a8f527057890a78ce743df749dec0edd3a7b SHA1 d4e36148a030c92eebc3eb839839f3ddf95e869a SHA256 9812252d32115b0590b3bea518d707a5f2c114df044b5574e02a0463c613c5db
-MISC ChangeLog 1284 RMD160 d602a654d8ca1484806b4f46ae93e95763023abf SHA1 0d879b433d139c695aeae10de209ff9facf7492d SHA256 fdf8a0cfc7e4b1bb423bdf0d15abea0ce3055ebe622df05d5b6254a6acb0aab4
+AUX qtscriptgenerator-0.1.0-gcc44.patch 919 RMD160 0d59634c2210514bebbe379ff81c5f5ca3c61b1a SHA1 5496c72279b1ff1367acf1f5c238840538ba3b0e SHA256 4c48b8d8f3495327e203b0476f511c9366612edd29a7645f9bb7669566f75cee
+DIST qtscriptgenerator-src-0.1.0.tar.gz 374223 RMD160 a02ce6fea2fbc3d3a6ae9e51c6b563ef4bcd51f3 SHA1 eeae733106369e289f257b754822bc372fd6ba75 SHA256 462ec57a65cf61228070a442299a5ecd189f80325f8246e5f98e0b8b06941f41
+EBUILD qtscriptgenerator-0.1.0.ebuild 1742 RMD160 fcd8a2b1ca49cb27bea557552f88183f524c715d SHA1 2b41142461c761924b370a80a832b6e7cd41ba94 SHA256 c9f40d8046481a67efc9122c52674a8766d7a124516feaf462456a382749a4a5
+EBUILD qtscriptgenerator-9999.ebuild 1517 RMD160 0d94e9ad722fa2c19b6dbf198097c234a3271bfc SHA1 47bff55fc04f5a391b430ccf056c337d979fcf54 SHA256 62eba116fa6f11086c7e2b01466e84698f43af598846ea8b6c26c5a89d8176ef
+MISC ChangeLog 1427 RMD160 751badd0f374195c66cfef72096808b586654df9 SHA1 96c858b2001817a5c60cbb7ab6696d91403d49dd SHA256 116df8cacf10d1f3608668998f57d04478f41c5c03d55e23be58eedf57508e1c
 MISC metadata.xml 174 RMD160 150ebb914d1d3dba874847502ec6fca3569bdd9d SHA1 069ee757d92149b01569258dd651246ae0c56e88 SHA256 24acedd614ebfee8dfa4f4bbe7729fd1b503351fb7c055fe3ff0109ef01e2a8e
diff --git a/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.1.0-gcc44.patch b/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.1.0-gcc44.patch
new file mode 100644
index 0000000000..d12462fa70
--- /dev/null
+++ b/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.1.0-gcc44.patch
@@ -0,0 +1,32 @@
+--- orig/generator/parser/rpp/pp-macro-expander.h    2009-02-20 12:42:24.000000000 +0100
++++ generator/parser/rpp/pp-macro-expander.h 2009-05-01 12:22:51.000000000 +0200
+@@ -15,6 +15,8 @@
+ #ifndef PP_MACRO_EXPANDER_H
+ #define PP_MACRO_EXPANDER_H
+
++#include <stdio.h>
++
+ namespace rpp {
+
+ struct pp_frame
+--- orig/generator/parser/rpp/pp-engine-bits.h       2009-02-20 12:42:24.000000000 +0100
++++ generator/parser/rpp/pp-engine-bits.h    2009-05-01 12:16:23.000000000 +0200
+@@ -15,6 +15,8 @@
+ #ifndef PP_ENGINE_BITS_H
+ #define PP_ENGINE_BITS_H
+
++#include <stdio.h>
++
+ namespace rpp {
+
+ inline std::string pp::fix_file_path(std::string const &filename) const
+--- orig/generator/parser/rpp/pp-internal.h	2009-02-20 12:42:24.000000000 +0100
++++ generator/parser/rpp/pp-internal.h	2009-05-01 12:24:47.000000000 +0200
+@@ -16,6 +16,7 @@
+ #define PP_INTERNAL_H
+ 
+ #include <algorithm>
++#include <stdio.h>
+ 
+ namespace rpp {
+ 
diff --git a/x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0.ebuild b/x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0.ebuild
new file mode 100644
index 0000000000..1e48de6dcc
--- /dev/null
+++ b/x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2009 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.ebuild,v 1.2 2009/05/08 01:48:35 loki_val Exp $
+
+EAPI="2"
+
+MY_PN="${PN}-src"
+MY_P="${MY_PN}-${PV}"
+
+inherit multilib qt4
+
+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"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="debug"
+
+DEPEND="
+	x11-libs/qt-gui:4
+	x11-libs/qt-opengl:4
+	|| (
+		x11-libs/qt-phonon:4
+		media-sound/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}"
+
+pkg_setup() {
+	QTDIR="/usr/include/qt4"
+	QTLIBDIR="/usr/$(get_libdir)/qt4/"
+}
+
+src_prepare() {
+	# remove phonon
+	sed -i \
+		-e "/typesystem_phonon.xml/d" \
+		generator/generator.qrc || die "sed failed"
+	sed -i \
+		-e "/qtscript_phonon/d" \
+		qtbindings/qtbindings.pro || die "sed failed"
+
+	# Fix for GCC-4.4, bug 268086
+	epatch "${FILESDIR}/${P}-gcc44.patch"
+	qt4_src_prepare
+}
+
+src_configure() {
+	cd "${S}"/generator
+	eqmake4 generator.pro
+	cd "${S}"/qtbindings
+	eqmake4 qtbindings.pro
+}
+
+src_compile() {
+	cd "${S}"/generator
+	emake || die "emake generator failed"
+	./generator --include-paths="/usr/include/qt4/" || die "running generator failed"
+	cd "${S}"/qtbindings
+	emake || die "make qtbindings failed"
+}
+
+src_install() {
+	insinto "${QTLIBDIR}"/plugins/script/
+	insopts -m0755
+	doins -r "${S}"/plugins/script/*.so || die "doins failed"
+}
diff --git a/x11-libs/qtscriptgenerator/qtscriptgenerator-9999.ebuild b/x11-libs/qtscriptgenerator/qtscriptgenerator-9999.ebuild
index a702ff6608..294d0c7354 100644
--- a/x11-libs/qtscriptgenerator/qtscriptgenerator-9999.ebuild
+++ b/x11-libs/qtscriptgenerator/qtscriptgenerator-9999.ebuild
@@ -16,7 +16,6 @@ SLOT="0"
 IUSE="debug"
 
 DEPEND="
-	x11-libs/qt-dbus:4
 	x11-libs/qt-gui:4
 	x11-libs/qt-opengl:4
 	|| (
@@ -26,6 +25,7 @@ DEPEND="
 	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}"
@@ -36,10 +36,11 @@ src_unpack() {
 	git_src_unpack
 }
 
-pkg_setup(){
+pkg_setup() {
 	QTDIR="/usr/include/qt4"
 	QTLIBDIR="/usr/$(get_libdir)/qt4/"
 }
+
 src_prepare() {
 	# remove phonon
 	sed -i \