Version bump with updated sqlite unbundling patch. Remove old.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72

6 files changed, 85 insertions, 64 deletions

diff --git a/net-news/quiterss/ChangeLog b/net-news/quiterss/ChangeLog
index 341c5102c7c5..7a3a9a98f07e 100644
--- a/net-news/quiterss/ChangeLog
+++ b/net-news/quiterss/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-news/quiterss
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/quiterss/ChangeLog,v 1.4 2012/10/29 11:59:57 yngwin Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-news/quiterss/ChangeLog,v 1.5 2013/01/10 11:08:34 pesa Exp $
+
+*quiterss-0.11.0 (10 Jan 2013)
+
+  10 Jan 2013; Davide Pesavento <pesa@gentoo.org>
+  +files/quiterss-0.11.0-unbundle-sqlite.patch, +quiterss-0.11.0.ebuild,
+  -files/quiterss-unbundle-sqlite.patch, -quiterss-0.10.2.ebuild,
+  -quiterss-0.10.3.ebuild:
+  Version bump with updated sqlite unbundling patch. Remove old.
 
 *quiterss-0.10.3 (29 Oct 2012)
 
diff --git a/net-news/quiterss/Manifest b/net-news/quiterss/Manifest
index 591d5d42183c..ca391a7c4409 100644
--- a/net-news/quiterss/Manifest
+++ b/net-news/quiterss/Manifest
@@ -1,7 +1,25 @@
-AUX quiterss-unbundle-sqlite.patch 585 SHA256 200ccd3f9eb92954b229d2fdcfcb3d6337f5f5867177425faca28426f475d7dc SHA512 62d35be76f1b1dbfdf642910c18434d8a4ae813192eaacf0a2322fe3dad03c47b04790f32e3c19743986aa15f59019cbd3cb5b8afb76efba3d6e40bb5f576c87 WHIRLPOOL de10117479115fa0eab227eb6b91c87c80f6f0ab98629b2d464d946627937b58ac31b1e3618837d480d28aec88528fb9babe26756179e3afe7968f2b1e73542a
-DIST QuiteRSS-0.10.2-src.tar.gz 2677153 SHA256 aad36b2666506722b681cd8f4c178484fc0f7bbf46ed4109c7de6ff257c6dbaa SHA512 478ab02ce0fce49cf07281a933529c9792d9aee253e6540673cdfcea37fbd0a40f7ba931fd53157387f81a063df9a1399da31232b88246ad3814b7345fde25a5 WHIRLPOOL ab54fe33732dd5c7d07d7bf087107a7214c4296a195ed56d7871f5ac2b61e87166f002067423322066eecc7e6648695258adc4029856901ff24245c52097bcb6
-DIST QuiteRSS-0.10.3-src.tar.gz 2738865 SHA256 a241db889615bd73a3e04a0479b80493837e695b3e1809e9c0fef32335dcb3bd SHA512 a3abd3d98b7523c36779d4a30ad602b8ce9fa234d6643838d563e88d8db11160f8075db3941611656906f156aa2b58fabc69928c66d785012a4135a2c08f3c3d WHIRLPOOL 1da898a63060fa184c02a2e4468db8dce6c2847680036fe7d0231e8b471790c01b47733fc420164b0c4145849e8eda3f73d7fccde9c93aa22d83452499ce15d5
-EBUILD quiterss-0.10.2.ebuild 759 SHA256 b13985d6c9e5f73226ec3fe2872dbded8e43421353f00df9d0998069ff216b21 SHA512 1f1b13437e222b3c12dc0a216479a14f6ac56b019e9eb3e84700b49c9261b4543031af3a7f10a2b196847c01922befb8046187b89fe1db735c037c29ef3360d3 WHIRLPOOL 15fb37eecc63eb6095d0d084d126fd6b431d5361ec6dd92e92aa25bf6f7693598b8b6fb8b99d59c62ea9c8fc7c97ba1ec01b90a08ca1a5a3a32eb7c874300541
-EBUILD quiterss-0.10.3.ebuild 759 SHA256 c23501083537d419158ebc6def8993a3696825870bfe0dcc71327c5ad224f03f SHA512 746bab03d2a46e4b755b5afd6f1b622271b08c5633e56abc0acfb6117034b6a5178fef161d492f2fcc09f5622d69c05525e406624a5cf4426c12f41df8318561 WHIRLPOOL d317aee32d3279a37eadef2683c4dc062728fe5d3f694c6fad737393853953889a5f821038bd254ed6ea7dc9050a54b3a936383194758ff2a816ff32a5f247fb
-MISC ChangeLog 976 SHA256 84e6eca9a8f69f2c690dc18714250a3219485d5dcbbfe764b3bfb7cd36dd98a6 SHA512 91d1e5838fd2ea91079acb23bf1cfbdc159c23887ef57170292a0d4686564b8962beefe05e00e17dad103ca6c5eae9ad6938e821fca370462d633fae778ad00b WHIRLPOOL 85bcb5a909ebea56fe75aae8a084b0ee1eec7e468a73d00822442331fe026ff94ef8047431cc5a1688feae29b41ff555eefef96554cdfac6f65718c21f53f9fa
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX quiterss-0.11.0-unbundle-sqlite.patch 1651 SHA256 e7aca7274580ff014d80b0543af248413bbf0c9875498535843e35afda33ac92 SHA512 666c56597787bf94accdd33825fbd11a686acd4468f606452bf15cae4f6c50bb97160a282cc1a51397afcd44e2771fe8b27721abad07fa6e2e7d592ef880586d WHIRLPOOL 8685b8fc63b342f8448387d74aa18ce9e99bd8972360dc72e066b60f6602fc5a687ceed1a37b7a33fa3bc2bc40ca99ba4d3186c87f2820a6bb047b38ca93b624
+DIST QuiteRSS-0.11.0-src.tar.gz 2758798 SHA256 5ac1642eb17fcdc6cb36efbf044ae1fe201d5ee33f99cff7eb296e90e2755ace SHA512 1424336f499fc0d2fc633707bbd2540e5a4f5d3fc446799166055ce7763347a55c074d1af21c9acc0e9d736d57a779ebd1cb12f859adfbae0b2bb3484e76e186 WHIRLPOOL 3411f011ef7c31f0322ee1deb48f6adfeed8a25a2d2fd547a65606eb96305a429b68e94ad541427ba8b944a9144a60cacc8c3e6020c67875ce769713444a6d60
+EBUILD quiterss-0.11.0.ebuild 728 SHA256 dee82129aca39012a46fece0a5f828575ac65c08473c62d36e4a93f6448deaec SHA512 d946213818cdfaea5824e01e06be26b484d1ff3f6093f5d0fcadd755dc992c69f6cc3a3a13e910465bd550f9d881c3c1ebc6ca965162b8c17bc9f3001ccf1559 WHIRLPOOL c4ba830b04448d0686d8a3be5b9f9d75bc50489ddf55038690671cb4cf4d31084ec1a67d95f28263da78358f0b8028b3fba639d6254feb5c0af9f5bddc568eb9
+MISC ChangeLog 1288 SHA256 d0b7648001cfce7a103a109ec651006c04724bd647b3aa2a59c2acebd5dee430 SHA512 83d0d8b03fcd82ffec0d502f7123d35a0fb09d9244945cb1bd00c276b456d9eb5b9b59ee2db49436a5a7933023203fe99ff9bf3d097236409f801eef2be0922f WHIRLPOOL 00122880ac258e3bb7a950f6d873666f4eabc582c4db6124e5900eb91d3bcc58d6347ad397875367302d567bb7ab720adf2d83cc6f54801c7d2fb5983c826a18
 MISC metadata.xml 306 SHA256 1e9e88933f61630889ccd531c512c47c5ae5626bb8af4bbc8cfd5083e5c5e336 SHA512 ea33bde61c3394bcd1b17467237d94d78d9f123d10ae200680b82c692598dbbfe3108694eb576de1eb613272c6bb696a1c6409603fc37415fee05dce64fa858f WHIRLPOOL 4f6ef9d720987665a3bccde23bfd0c10039ac81d332f86ae4d02f480b2841908a30364983d516cc57777bfce1101667ae1b7a4d5010341fffd979b96d901455c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQ7qEyAAoJENXLsxwXqFxyzqUP/iA/QL/7xnHVWajYRQZL0f19
+hGqfMpFRy0re7ldrtQ9bXjOXb+bLJ3mnDYtbWMut5c3d42H6ko/+LJKrHtl6v+re
+yz+aiMHc7P9+jTokzj5AKg3utqX2vIDcx7ezk5wZcE2fn8mqcxUamMPU/n25Q2p8
+fmvBKPLeRJ2gx1EC0N0YxHC74cQCqOHI19aQsWVHzb5k4qH2biHvsCMCL/rThxFc
+adIvqSLxpx4O/h5ThEsmGmJjsvnuogrphmmeCdIOx2rF5/fRaY+0dhPflMWxuIEN
+VI/AQpTUtmfWO1gu91yQ/ccIBrkJ97Z9njPCDMpsZpa2l86ThcBMTbN0Ej+CQvAD
+ACfvEgmVW+/15qJbCUVKZ+x/eqVOS7+cfIe04lWJSx8EinhrVDn9XQiJNrUAaj7S
+ffF+iW3vhtVtsWLsoV9+9dSQFMRWLGgjNCfATntO8Tcyn9yhMwO+kmgSRdnQfcxv
+9C1xPfXLUpcaZ+NMUa0UmUn5OYfUzVgr1tFH7U8B3l7e8ViEqixp/TJHRNLmMjNq
+zLUlDPcUEV7nXwN02yGCXSMkbMg+UKAo9PQauvdE69OoVp+h7M7ZNeu/GaNWNI/E
+aleBZcWpTyUf99e16G9l9GcZbgoY7OZyLekcXVwvJ0ZitFmKtpAniESN4e68iE8u
+1VLDX5QmMF7L8CZPqFr3
+=Ddnk
+-----END PGP SIGNATURE-----
diff --git a/net-news/quiterss/files/quiterss-0.11.0-unbundle-sqlite.patch b/net-news/quiterss/files/quiterss-0.11.0-unbundle-sqlite.patch
new file mode 100644
index 000000000000..723a5d149699
--- /dev/null
+++ b/net-news/quiterss/files/quiterss-0.11.0-unbundle-sqlite.patch
@@ -0,0 +1,42 @@
+diff -Naur QuiteRSS-0.11.0-src.orig/QuiteRSS.pro QuiteRSS-0.11.0-src/QuiteRSS.pro
+--- QuiteRSS-0.11.0-src.orig/QuiteRSS.pro	2013-01-10 02:39:15.021798989 -0800
++++ QuiteRSS-0.11.0-src/QuiteRSS.pro	2013-01-10 02:48:20.244982761 -0800
+@@ -90,7 +90,7 @@
+ MOC_DIR = $${BUILD_DIR}/moc/

+ RCC_DIR = $${BUILD_DIR}/rcc/

+ 

+-include(3rdparty/sqlite.pri)

++LIBS += -lsqlite3

+ include(3rdparty/qtsingleapplication/qtsingleapplication.pri)

+ include(3rdparty/qyursqltreeview/qyursqltreeview.pri)

+ include(lang/lang.pri)

+diff -Naur QuiteRSS-0.11.0-src.orig/src/aboutdialog.cpp QuiteRSS-0.11.0-src/src/aboutdialog.cpp
+--- QuiteRSS-0.11.0-src.orig/src/aboutdialog.cpp	2013-01-10 02:39:15.029798889 -0800
++++ QuiteRSS-0.11.0-src/src/aboutdialog.cpp	2013-01-10 02:41:44.171934356 -0800
+@@ -1,11 +1,7 @@
+ #include "aboutdialog.h"

+ #include "VersionNo.h"

+ #include "VersionRev.h"

+-#if QT_VERSION >= 0x040800

+-#include <sqlite_qt48x/sqlite3.h>

+-#else

+-#include <sqlite_qt47x/sqlite3.h>

+-#endif

++#include <sqlite3.h>

+ #include <qyursqltreeview.h>

+ 

+ AboutDialog::AboutDialog(const QString &lang, QWidget *parent) :

+diff -Naur QuiteRSS-0.11.0-src.orig/src/dbmemfilethread.cpp QuiteRSS-0.11.0-src/src/dbmemfilethread.cpp
+--- QuiteRSS-0.11.0-src.orig/src/dbmemfilethread.cpp	2013-01-10 02:39:15.030798877 -0800
++++ QuiteRSS-0.11.0-src/src/dbmemfilethread.cpp	2013-01-10 02:42:07.203646420 -0800
+@@ -1,9 +1,5 @@
+ #include "dbmemfilethread.h"

+-#if QT_VERSION >= 0x040800

+-#include <sqlite_qt48x/sqlite3.h>

+-#else

+-#include <sqlite_qt47x/sqlite3.h>

+-#endif

++#include <sqlite3.h>

+ #include <QDebug>

+ 

+ DBMemFileThread::DBMemFileThread(QObject *pParent)

diff --git a/net-news/quiterss/files/quiterss-unbundle-sqlite.patch b/net-news/quiterss/files/quiterss-unbundle-sqlite.patch
deleted file mode 100644
index 30cc034c960f..000000000000
--- a/net-news/quiterss/files/quiterss-unbundle-sqlite.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# HG changeset patch
-# User Alec Moskvin <alecm@gmx.com>
-# Date 1348285967 14400
-# Node ID 8f42fc4314d1ece4c2da9a97e5a4762af674f4a5
-# Parent  5baf30ee9b6e0bc538da9686080acfe91b5ce5a5
-Don't use bundled SQLite
-
-diff -r 5baf30ee9b6e -r 8f42fc4314d1 QuiteRSS.pro
---- a/QuiteRSS.pro	Fri Sep 21 20:51:55 2012 +0600
-+++ b/QuiteRSS.pro	Fri Sep 21 23:52:47 2012 -0400
-@@ -86,7 +86,7 @@
- MOC_DIR = $${BUILD_DIR}/moc/

- RCC_DIR = $${BUILD_DIR}/rcc/

- 

--include(3rdparty/sqlite.pri)

-+LIBS += -lsqlite3

- include(3rdparty/qtsingleapplication/qtsingleapplication.pri)

- include(lang/lang.pri)

- 

diff --git a/net-news/quiterss/quiterss-0.10.3.ebuild b/net-news/quiterss/quiterss-0.10.3.ebuild
deleted file mode 100644
index fdc910f11a40..000000000000
--- a/net-news/quiterss/quiterss-0.10.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/quiterss/quiterss-0.10.3.ebuild,v 1.1 2012/10/29 11:59:57 yngwin Exp $
-
-EAPI=4
-inherit qt4-r2
-
-MY_P=QuiteRSS-${PV}-src
-DESCRIPTION="A Qt4-based RSS/Atom feed reader"
-HOMEPAGE="http://code.google.com/p/quite-rss/"
-SRC_URI="http://quite-rss.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	x11-libs/qt-sql:4
-	x11-libs/qt-webkit:4"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-DOCS=(AUTHORS HISTORY_EN HISTORY_RU README)
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-unbundle-sqlite.patch # bug 436230
-	epatch_user
-}
diff --git a/net-news/quiterss/quiterss-0.10.2.ebuild b/net-news/quiterss/quiterss-0.11.0.ebuild
index deb4279ebfc0..e43a78500f3a 100644
--- a/net-news/quiterss/quiterss-0.10.2.ebuild
+++ b/net-news/quiterss/quiterss-0.11.0.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/quiterss/quiterss-0.10.2.ebuild,v 1.1 2012/10/03 07:41:21 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/quiterss/quiterss-0.11.0.ebuild,v 1.1 2013/01/10 11:08:34 pesa Exp $
+
+EAPI=5
 
-EAPI=4
 inherit qt4-r2
 
 MY_P=QuiteRSS-${PV}-src
+
 DESCRIPTION="A Qt4-based RSS/Atom feed reader"
 HOMEPAGE="http://code.google.com/p/quite-rss/"
 SRC_URI="http://quite-rss.googlecode.com/files/${MY_P}.tar.gz"
@@ -22,9 +24,9 @@ DEPEND="x11-libs/qt-core:4
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
+
 DOCS=(AUTHORS HISTORY_EN HISTORY_RU README)
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-unbundle-sqlite.patch # bug 436230
-	epatch_user
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-0.11.0-unbundle-sqlite.patch"
+)