Fix gcc-4.4 compilation (#274220), always depend on qt-sql (#274743)

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

4 files changed, 50 insertions, 4 deletions

diff --git a/dev-db/tora/ChangeLog b/dev-db/tora/ChangeLog
index ece58dbe6c77..fe5ef6a9e214 100644
--- a/dev-db/tora/ChangeLog
+++ b/dev-db/tora/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/tora
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.68 2009/05/04 16:52:32 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.69 2009/06/25 21:06:31 dertobi123 Exp $
+
+  25 Jun 2009; Tobias Scherbaum <dertobi123@gentoo.org>
+  +files/tora-2.0.0-gcc44.patch, tora-2.0.0.ebuild:
+  Fix gcc-4.4 compilation (#274220), always depend on qt-sql (#274743)
 
   04 May 2009; Tobias Scherbaum <dertobi123@gentoo.org> ChangeLog:
   Add dep on dev-db/oracle-instantclient-sqlplus for +oci8-instant-client,
diff --git a/dev-db/tora/Manifest b/dev-db/tora/Manifest
index e296e5e8b16d..7877eeda639a 100644
--- a/dev-db/tora/Manifest
+++ b/dev-db/tora/Manifest
@@ -1,4 +1,5 @@
 AUX gcc41.patch 438 RMD160 5ba95db43198d2ca79aa66fcf8b1f1719ca30fd5 SHA1 bcdaee7a567bc42c42625943792f3c817db188d9 SHA256 bceeefe86bd8ecf5d2194de6c5aff66f7103ef295ae2e247eedde57e91bfb21d
+AUX tora-2.0.0-gcc44.patch 1077 RMD160 76407025786717cc51227f5fbb0fe89924d0637c SHA1 ed8d896c763c78ea799c0553f19ab11e646bd0ef SHA256 e1f0a90cba79fcd5a6b486e50357e2641ebef248807e9d893287021c8f54effb
 AUX tora-gcc43.patch 304 RMD160 86bd8f66d392671667409674c0788aad1d67e52f SHA1 74367200e2739e0d4336a69d0fcdbc0424141536 SHA256 a551a1ba43fe48027bc4cc8d721c8645c40a530f0dbf6686cd0dc91e5e04c0b9
 AUX tora.desktop 267 RMD160 489ca7e384df925ed00842b405a8a8449f247d13 SHA1 497070e2b7e6f282ea82f5d625088678f706c68b SHA256 601dd498ffd8c26dbc02abb6cfba714d62863462000d6db867a7925446f4ad2f
 AUX tora.png 1227 RMD160 92904c3d0026829ceabf5acd86bce3c340fb8494 SHA1 bf8b89970377bace9f432b9dd56b16ef82f332fe SHA256 d218247bc2eb885a3783ab8b6f4f3f456df4b812d21b093f9b007da405f8068a
@@ -9,6 +10,6 @@ DIST tora-2.0.0.tar.gz 6726940 RMD160 47d1f788a9a3406d2d553b423a229f38284d616b S
 EBUILD tora-1.3.21-r1.ebuild 2105 RMD160 6f4a1ba58f922cf7034349e69b0ede29940061f6 SHA1 4714b30f2d56d8fd342e59af1e102851f04c991e SHA256 239d22eb608a72aca86ef5766fe1d35c971db01f5326fe46cfe68e80677fadc6
 EBUILD tora-1.3.22.ebuild 2030 RMD160 94d0a41eb779eece6016a56a4bb38827da5af44f SHA1 44eacb3ee2a16b903a9d69e387f2df66adfe0e2e SHA256 b85dceed8a81764c4b19f4b87aa1cd48f19f35146e44989ced217c2b43dad9b9
 EBUILD tora-1.3.23.ebuild 2168 RMD160 e642c6ff42c9bf9ded8b0c489a4b1a8b61b730fb SHA1 ff820b1a0d9e685322a3e8fa2c737c4798e9012f SHA256 3946d86f717f3aa0b1379841805f3e88a8a5002f80b2282d1b72e9e0aaf44620
-EBUILD tora-2.0.0.ebuild 2298 RMD160 3b836781e482004ef33e1f87474101f23d26c5ad SHA1 bdb241f1277a154ac3d4e23176d24f6de86a08f9 SHA256 c0818f28e10c729419ec5967e41d77ed7aefd24581014b4e3c39c75102fdfea2
-MISC ChangeLog 10551 RMD160 567baa2e0a09fc2a7da73c9f1577bb2a435d14e0 SHA1 f7d4c8524e310de62d552ab5126947eed05c572d SHA256 a7758ed8a1915e399556ac7130e132b45a18fd1db229251eac0d71219689c0b4
+EBUILD tora-2.0.0.ebuild 2315 RMD160 ed5a8a78efed2e5170b703a9000f97d9d698182a SHA1 015603abaff649965971ac74882917c1ad00b5e8 SHA256 b472baa64400249fa51e9f225ad853cb38f828f845e3a99eadea588a9c7030da
+MISC ChangeLog 10731 RMD160 2c91009e314e4bd3aca3d164ada19bfc3cc6e58e SHA1 c7d3d533a6cb680beeb208cc688184b78e47a939 SHA256 9eb9d762324de668e09634e4d327a351ddee73d567c11d801aaec558fdb319f4
 MISC metadata.xml 545 RMD160 c8a0b509c95d54228308ab8016ca36f36cde8b78 SHA1 992a140bc0b64afcbd46a3feaff6a4adf85fea3b SHA256 99c153750d77644b1e959d2dba6d413fd23fdc4f4d55ea04e5d283f43aae6f95
diff --git a/dev-db/tora/files/tora-2.0.0-gcc44.patch b/dev-db/tora/files/tora-2.0.0-gcc44.patch
new file mode 100644
index 000000000000..468e37a033c5
--- /dev/null
+++ b/dev-db/tora/files/tora-2.0.0-gcc44.patch
@@ -0,0 +1,40 @@
+--- src/toqvalue.cpp.orig	2009-06-25 21:56:21.879870369 +0200
++++ src/toqvalue.cpp	2009-06-25 21:56:35.759867041 +0200
+@@ -44,6 +44,7 @@
+ #include "toconf.h"
+ #include "toqvalue.h"
+ 
++#include <cstdio>
+ #include <QVariant>
+ #include <QApplication>
+ 
+--- src/tomodeleditor.cpp.orig	2009-06-25 21:59:49.922104810 +0200
++++ src/tomodeleditor.cpp	2009-06-25 21:59:59.904863047 +0200
+@@ -48,6 +48,7 @@
+ #include "toresultview.h"
+ #include "tomain.h"
+ 
++#include <cstdio>
+ #include <qcheckbox.h>
+ #include <qlayout.h>
+ #include <qpixmap.h>
+--- src/toresultview.cpp.orig	2009-06-25 22:01:53.095862952 +0200
++++ src/toresultview.cpp	2009-06-25 22:02:06.038862175 +0200
+@@ -54,6 +54,7 @@
+ #include "totool.h"
+ #include "toresultlistformat.h"
+ 
++#include <cstdio>
+ #include <qapplication.h>
+ #include <qclipboard.h>
+ #include <qcombobox.h>
+--- src/todebug.cpp.orig	2009-06-25 22:31:27.233110649 +0200
++++ src/todebug.cpp	2009-06-25 22:31:41.032862675 +0200
+@@ -58,6 +58,7 @@
+ #include "totool.h"
+ #include "tocodemodel.h"
+ 
++#include <cstdio>
+ #include <stack>
+ 
+ #include <qcheckbox.h>
diff --git a/dev-db/tora/tora-2.0.0.ebuild b/dev-db/tora/tora-2.0.0.ebuild
index c12055bd9cc7..cb9a5de94c32 100644
--- a/dev-db/tora/tora-2.0.0.ebuild
+++ b/dev-db/tora/tora-2.0.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/dev-db/tora/tora-2.0.0.ebuild,v 1.3 2009/05/04 16:51:46 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-2.0.0.ebuild,v 1.4 2009/06/25 21:06:31 dertobi123 Exp $
 
 EAPI=2
 
@@ -17,6 +17,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
 
 RDEPEND="${DEPEND}"
 DEPEND="dev-lang/perl
+	x11-libs/qt-sql
 	mysql? ( x11-libs/qt-sql[mysql] )
 	postgres? ( x11-libs/qt-sql[postgres] )
 	>=x11-libs/qscintilla-2.1[qt4]