Revbump to fix qt-4.7.0 issue

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 48 insertions, 4 deletions

diff --git a/dev-db/sqlitebrowser/ChangeLog b/dev-db/sqlitebrowser/ChangeLog
index 9722a2049884..826e0b4798b1 100644
--- a/dev-db/sqlitebrowser/ChangeLog
+++ b/dev-db/sqlitebrowser/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/sqlitebrowser
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlitebrowser/ChangeLog,v 1.10 2010/11/06 12:13:13 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlitebrowser/ChangeLog,v 1.11 2010/11/07 15:20:42 xmw Exp $
+
+*sqlitebrowser-2.0_beta1-r1 (07 Nov 2010)
+
+  07 Nov 2010; Michael Weber <xmw@gentoo.org>
+  -sqlitebrowser-2.00_beta1.ebuild, +sqlitebrowser-2.0_beta1-r1.ebuild,
+  +files/sqlitebrowser-2.0_beta1-qt-4.7.0.patch, metadata.xml:
+  Revbump to fix qt-4.7.0 issue (bug #338476), taking maintainership.
 
   06 Nov 2010; Michael Weber <xmw@gentoo.org>
   sqlitebrowser-2.00_beta1.ebuild:
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-2.0_beta1-qt-4.7.0.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-2.0_beta1-qt-4.7.0.patch
new file mode 100644
index 000000000000..b17a1fe2b839
--- /dev/null
+++ b/dev-db/sqlitebrowser/files/sqlitebrowser-2.0_beta1-qt-4.7.0.patch
@@ -0,0 +1,31 @@
+As suggested by Andreas Gölzer at http://sourceforge.net/tracker/index.php?func=detail&aid=3096050&group_id=87946&atid=584909
+
+--- trunk/sqlitebrowser/sqlitebrowser/sqlitedb.h
++++ trunk/sqlitebrowser/sqlitebrowser/sqlitedb.h
+@@ -41,7 +41,7 @@
+ class DBBrowserField
+     {    
+     public:
+-        DBBrowserField() : name( 0 ) { }
++        DBBrowserField() : name( "0" ) { }
+         DBBrowserField( const QString& wname,const QString& wtype )
+             : name( wname), type( wtype )
+         { }
+@@ -55,7 +55,7 @@
+ class DBBrowserIndex
+     {    
+     public:
+-        DBBrowserIndex() : name( 0 ) { }
++        DBBrowserIndex() : name( "0" ) { }
+        DBBrowserIndex( const QString& wname,const QString& wsql )
+             : name( wname), sql( wsql )
+         { }
+@@ -70,7 +70,7 @@
+ class DBBrowserTable
+     {    
+     public:
+-        DBBrowserTable() : name( 0 ) { }
++        DBBrowserTable() : name( "0" ) { }
+         DBBrowserTable( const QString& wname,const QString& wsql )
+             : name( wname), sql( wsql )
+         { }
diff --git a/dev-db/sqlitebrowser/metadata.xml b/dev-db/sqlitebrowser/metadata.xml
index 636ff35e4b62..db8930bacf29 100644
--- a/dev-db/sqlitebrowser/metadata.xml
+++ b/dev-db/sqlitebrowser/metadata.xml
@@ -3,7 +3,8 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>maintainer-needed@gentoo.org</email>
+  <email>xmw@gentoo.org</email>
+  <name>Michael Weber</name>
 </maintainer>
 <longdescription lang="en">
 SQLite Database Browser is a freeware, public domain, open source visual tool
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-2.00_beta1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-2.0_beta1-r1.ebuild
index 5aea605eec10..be3941c2164f 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-2.00_beta1.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-2.0_beta1-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlitebrowser/sqlitebrowser-2.00_beta1.ebuild,v 1.2 2010/11/06 12:13:13 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlitebrowser/sqlitebrowser-2.0_beta1-r1.ebuild,v 1.1 2010/11/07 15:20:42 xmw Exp $
 
 EAPI=2
+
 inherit eutils qt4
 
 DESCRIPTION="SQLite Database Browser"
@@ -14,10 +15,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="=x11-libs/qt-gui-4.6*:4[qt3support]"
+DEPEND=">=x11-libs/qt-gui-4.6:4[qt3support]"
 
 S=${WORKDIR}/trunk/${PN}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-qt-4.7.0.patch
+}
+
 src_configure() {
 	eqmake4 sqlitedbbrowser.pro
 }