Version bump with updated sqlite unbundling patch. Remove old.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 17A85C72)

5 files changed, 61 insertions, 58 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/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"
+)