Revbump to fix qt-4.7.0 issue

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 52 insertions, 7 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/Manifest b/dev-db/sqlitebrowser/Manifest
index b70812349c18..5dd6d848d1f6 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,4 +1,5 @@
+AUX sqlitebrowser-2.0_beta1-qt-4.7.0.patch 1044 RMD160 1a34b9b4b5e749a1f178458ff39ad6aa63c5b9ab SHA1 24b473f3090000c2324e3c35168f3325a30d66c8 SHA256 c1be6fa7c392007161b8bb26842a031359a1c8e95085e8e8db68203388551fd5
 DIST sqlitebrowser_200_b1_src.tar.gz 1136660 RMD160 f5f1cf3f5d300a80a1cfec31a0f1631801f35ec3 SHA1 e8e1a08a0f728df0984f0c08577c91863bf91b62 SHA256 421f8cf097e9b7eefcc0f3f816ed2ef175d1e836682da0f3890d48f200d21cbd
-EBUILD sqlitebrowser-2.00_beta1.ebuild 731 RMD160 c653bcb17ef056458636bd707e1dbaedb08ecd39 SHA1 8346ed21624f5b65fd7b0c0db8e9944928de2e88 SHA256 b34b3e01eae5db7adc35f543f16f0005779098ee271f55b868639199e5a11881
-MISC ChangeLog 1750 RMD160 5e0f5cfdb28c679df23192fce7692ac99f934efb SHA1 640eda0b6cfadefdb5c8a52c70ef8c4b12f3d28e SHA256 f080834e11b295ad3cab6caa78813e10e70111ac57c71ecf15a3ff355aa1d8a2
-MISC metadata.xml 626 RMD160 1324025418c8c23be12cb84fd06e7d45286dbeae SHA1 6e82f808f98666f1a874ef1fc03c5fc65044d5bd SHA256 f9168bea65be10405646898cf85a671b852ea2c2da0103674c96a6bb7d3e7de4
+EBUILD sqlitebrowser-2.0_beta1-r1.ebuild 795 RMD160 beadebd294b2d911a55254dfae554bda653a0b6a SHA1 ac6cc07a9d756c9eede18cb8c07039cb863d659c SHA256 823ba129a9271f663cb24fa5d57312cbc761faf13c2acbd2f19fef82d94a309a
+MISC ChangeLog 2045 RMD160 a2f23133f2a49f6269ed7842c4b2a1f9d5d3ac56 SHA1 ae37a2b7e09b97579a40c35efe7550ecdb706346 SHA256 3ce39e48b6092a6ac9134f49367d23ce125110ec71266bc519514ca8bbefa3b1
+MISC metadata.xml 641 RMD160 5b6f9f85008581c24f5b868a062b707d7eaeaadb SHA1 93ff8955946f2bc9b9fc1d5aee7431dfeb65d712 SHA256 325e3d6cdcb3952c1e079fef034ce81dd3e923834a24c4579fcf67fdf6670601
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
 }