[x11-libs/qtscriptgenerator] Remove 0.1.0. Simplify deps, use a more correct gcc-4.4 patch.

6 files changed, 35 insertions, 136 deletions

diff --git a/x11-libs/qtscriptgenerator/ChangeLog b/x11-libs/qtscriptgenerator/ChangeLog
index a5f2218fc0..4f41256632 100644
--- a/x11-libs/qtscriptgenerator/ChangeLog
+++ b/x11-libs/qtscriptgenerator/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Jun 2009; Ben de Groot <yngwin@gentoo.org>
+  -qtscriptgenerator-0.1.0.ebuild,
+  -files/qtscriptgenerator-0.1.0-gcc44.patch,
+  +files/qtscriptgenerator-gcc44.patch, qtscriptgenerator-9999.ebuild:
+  Remove 0.1.0 version which is in portage. Simplify deps, use a more
+  correct gcc-4.4 patch.
+
   20 May 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
   qtscriptgenerator-9999.ebuild:
   Dropped qt-dbus deps, added qt-webkit deps
diff --git a/x11-libs/qtscriptgenerator/Manifest b/x11-libs/qtscriptgenerator/Manifest
index 926e58a7d2..81d40d3001 100644
--- a/x11-libs/qtscriptgenerator/Manifest
+++ b/x11-libs/qtscriptgenerator/Manifest
@@ -1,6 +1,4 @@
-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 1563 RMD160 069bf0e6b0371cba210c5ac0233a6ba6ddab0a64 SHA1 cd789f832cfd23a98f0016e0fcb0bcfcc4a11410 SHA256 6e27aa882ecba88de7a0f97dd81e64ff90469bf4424b375d4d13fadfaed34a7b
-MISC ChangeLog 1427 RMD160 751badd0f374195c66cfef72096808b586654df9 SHA1 96c858b2001817a5c60cbb7ab6696d91403d49dd SHA256 116df8cacf10d1f3608668998f57d04478f41c5c03d55e23be58eedf57508e1c
+AUX qtscriptgenerator-gcc44.patch 495 RMD160 7e58d78e23aaf6e89b070941517a0db3cbc45ff4 SHA1 87cd599403fa9bb441ddc27c77e0b6242e2cc150 SHA256 6cc6825725e5746ddbf4f5f4376ce8584cb74643027a84b4eb44c10850a7205a
+EBUILD qtscriptgenerator-9999.ebuild 1426 RMD160 fe0b4140f360bb5c955cb48cf403209b1be88355 SHA1 9cb0d1b2917ecd8538e31242899a5e89c93435e0 SHA256 34590799663eefebfae82460241a7b823c4a2e74f6054237b0afcc63128183cd
+MISC ChangeLog 1723 RMD160 24e92f6afdcc660c02f9766deeed3c997908aaa1 SHA1 a5e5c18dfbc7e0c493a6b6e9f5da178d967ed600 SHA256 e502a53a0c6109b944fe36362edfb396648f18f9010e01204e1ad9b003f4bef3
 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
deleted file mode 100644
index d12462fa70..0000000000
--- a/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.1.0-gcc44.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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/files/qtscriptgenerator-gcc44.patch b/x11-libs/qtscriptgenerator/files/qtscriptgenerator-gcc44.patch
new file mode 100644
index 0000000000..dbb423e5d8
--- /dev/null
+++ b/x11-libs/qtscriptgenerator/files/qtscriptgenerator-gcc44.patch
@@ -0,0 +1,15 @@
+# Patch from upstream bug tracker:
+# http://code.google.com/p/qtscriptgenerator/issues/detail?id=37
+# So far (2009-06-12) this has not been applied at upstream git repo
+
+diff -uNr generator.orig/parser/rpp/pp.h generator/parser/rpp/pp.h
+--- generator.orig/parser/rpp/pp.h	2008-12-05 11:01:44.000000000 +0100
++++ generator/parser/rpp/pp.h	2008-12-13 10:42:22.000000000 +0100
+@@ -30,6 +30,7 @@
+ #include <cctype>
+
+ #include <fcntl.h>
++#include <cstdio>
+
+ #ifdef HAVE_MMAP
+ #  include <sys/mman.h>
diff --git a/x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0.ebuild b/x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0.ebuild
deleted file mode 100644
index 1e48de6dcc..0000000000
--- a/x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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 8315b40ab8..f2a9035d7e 100644
--- a/x11-libs/qtscriptgenerator/qtscriptgenerator-9999.ebuild
+++ b/x11-libs/qtscriptgenerator/qtscriptgenerator-9999.ebuild
@@ -15,19 +15,13 @@ KEYWORDS=""
 SLOT="0"
 IUSE="debug"
 
-DEPEND="
-	x11-libs/qt-gui:4
+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
-"
+	x11-libs/qt-xmlpatterns:4"
 RDEPEND="${DEPEND}"
 
 PLUGINS="core gui network opengl sql svg uitools webkit xml xmlpatterns"
@@ -36,20 +30,14 @@ src_unpack() {
 	git_src_unpack
 }
 
-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"
-	epatch "${FILESDIR}/${P}-gcc44.patch"
+	sed -i "/typesystem_phonon.xml/d" generator/generator.qrc \
+		|| die "sed failed"
+	sed -i "/qtscript_phonon/d" qtbindings/qtbindings.pro \
+		|| die "sed failed"
+
+	epatch "${FILESDIR}/${PN}-gcc44.patch"
 	git_src_prepare
 	qt4_src_prepare
 }
@@ -65,12 +53,13 @@ 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/
+	insinto /usr/$(get_libdir)/qt4/plugins/script/
 	insopts -m0755
 	doins -r "${S}"/plugins/script/*.so || die "doins failed"
 }