Use a more correct gcc-4.4 patch. Minor ebuild cleanups.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 32 insertions, 51 deletions

diff --git a/x11-libs/qtscriptgenerator/ChangeLog b/x11-libs/qtscriptgenerator/ChangeLog
index 5a90833c1c96..5fc5ed4308fd 100644
--- a/x11-libs/qtscriptgenerator/ChangeLog
+++ b/x11-libs/qtscriptgenerator/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qtscriptgenerator
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/ChangeLog,v 1.4 2009/06/05 10:37:26 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/ChangeLog,v 1.5 2009/06/12 22:49:51 yngwin Exp $
+
+  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:
+  Use a more correct gcc-4.4 patch. Minor ebuild cleanups.
 
   05 Jun 2009; Ben de Groot <yngwin@gentoo.org>
   qtscriptgenerator-0.1.0.ebuild:
diff --git a/x11-libs/qtscriptgenerator/Manifest b/x11-libs/qtscriptgenerator/Manifest
index f1a9ce336a2e..c0f13422df6c 100644
--- a/x11-libs/qtscriptgenerator/Manifest
+++ b/x11-libs/qtscriptgenerator/Manifest
@@ -1,5 +1,5 @@
-AUX qtscriptgenerator-0.1.0-gcc44.patch 919 RMD160 0d59634c2210514bebbe379ff81c5f5ca3c61b1a SHA1 5496c72279b1ff1367acf1f5c238840538ba3b0e SHA256 4c48b8d8f3495327e203b0476f511c9366612edd29a7645f9bb7669566f75cee
+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.ebuild 1780 RMD160 50c2a71d777207373dd51fb411b8627b65630f7c SHA1 89d56eed73535e07953adeecdbdfec7f22d85771 SHA256 4f270904d86c90ef50e5dc3612bf87306bdab42b84386f64c07d8228c504a58e
-MISC ChangeLog 1050 RMD160 96e7c46949eee29a42c57a977d6b47fef06a4b67 SHA1 8430f31cbcfa70197af8cf1a7b50bd81e4691c21 SHA256 04acff49c6a6e9afa18fb293c55b76a21171f5a6076e59557310dd0291b2a432
+EBUILD qtscriptgenerator-0.1.0.ebuild 1690 RMD160 2bcb7bc074f308a69fb7f71483ec63caa4f6e81b SHA1 334130c266012006100cd7ae80462e9bfdc12cda SHA256 f009c4e3858e3d5715e124ac7e495d8710d7f4fa6278d9e9d44eb13479f3d14e
+MISC ChangeLog 1278 RMD160 a254d9905c0d59f25e55bce38b0155284cb8eda9 SHA1 923b3090c4be8338fcbc1f7300dcc9271ee16105 SHA256 c9eedf9c296329f3bef6cd8ccd2518d1b974a3cedc695d16196614aa970c8c09
 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 d12462fa709d..000000000000
--- 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 000000000000..dbb423e5d808
--- /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
index f207a64206c7..87c672103838 100644
--- a/x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0.ebuild
+++ b/x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2009/06/05 10:37:26 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0.ebuild,v 1.5 2009/06/12 22:49:51 yngwin Exp $
 
 EAPI="2"
 
@@ -38,22 +38,13 @@ 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"
+	sed -i "/typesystem_phonon.xml/d" generator/generator.qrc || die "sed failed"
+	sed -i "/qtscript_phonon/d" qtbindings/qtbindings.pro || die "sed failed"
 
 	# Fix for GCC-4.4, bug 268086
-	epatch "${FILESDIR}/${P}-gcc44.patch"
+	epatch "${FILESDIR}/${PN}-gcc44.patch"
 	qt4_src_prepare
 }
 
@@ -66,14 +57,15 @@ src_configure() {
 
 src_compile() {
 	cd "${S}"/generator
-	emake || die "emake generator failed"
+	emake || die "make 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"
 }