Version bump. Unbundle sqlite with patch by Alec Moskvin in bug #436230. Remove old.

Package-Manager: portage-2.2.0_alpha123/cvs/Linux x86_64

5 files changed, 44 insertions, 34 deletions

diff --git a/net-news/quiterss/ChangeLog b/net-news/quiterss/ChangeLog
index 5b1c65560c38..1648572a215b 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.2 2012/09/02 02:21:15 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/quiterss/ChangeLog,v 1.3 2012/10/03 07:41:22 yngwin Exp $
+
+*quiterss-0.10.2 (03 Oct 2012)
+
+  03 Oct 2012; Ben de Groot <yngwin@gentoo.org>
+  +files/quiterss-unbundle-sqlite.patch, +quiterss-0.10.2.ebuild,
+  -quiterss-0.10.1.ebuild, metadata.xml:
+  Version bump. Unbundle sqlite with patch by Alec Moskvin in bug #436230.
+  Remove old.
 
 *quiterss-0.10.1 (02 Sep 2012)
 
diff --git a/net-news/quiterss/Manifest b/net-news/quiterss/Manifest
index 7692d7a334fd..7ecab8a6fc4d 100644
--- a/net-news/quiterss/Manifest
+++ b/net-news/quiterss/Manifest
@@ -1,24 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST QuiteRSS-0.10.1-src.tar.gz 2657226 SHA256 e0f1ca3b7351cdd1b89d0bfa36d27c45bf94685c8a49d24859cb18d67c008169 SHA512 ef3e62576573d67062ddeff892fc07b69a662250bcccc6918d339ab88f4808c19d591b70b2e2b745f9b22f0645c029c01fb512f5baa7a614b664ae4607ecc42b WHIRLPOOL dd321f98335bf4b33582d3207eb9bb7f74429f2fd6e4ad3c71983255374589d0da241bda3b8a8b639fbd0584af8f408bbbed497a34b6159c13686dbc8b5a4598
-EBUILD quiterss-0.10.1.ebuild 665 SHA256 bdfd3a4b0c4bde4bf8beb009e887f31f1dadaca38a6fbdb2ccd37cf280165b1c SHA512 008a5ee22480fb13ac35c8df004270c4a26f119abea5c39087e5f766d063640820a9e48ff8ebc439f4308dc56332f2e38d9a65481da9e02415526f6ff162a967 WHIRLPOOL 85c9d60605c66342e14fc1e818a74e68d1abbd23717965b853380ff783ef54f08bbd356d6dbd973205958770cf448c2691868655ad6011b675f805bf07bb68d8
-MISC ChangeLog 534 SHA256 c6a2dc7a0a97e3a69a7e5ea932fd8e03ca5c57d900735717de1ba18f38184572 SHA512 8af7f2e483655870dbf8fb8bab182baf1bdf34d41403bb61ea2029c392a9396dfb771cbea1f8c0ce83537a8f182038114c8034e707841df58785553aad536fbd WHIRLPOOL a94a725ac782b6f686382b1579defe43e4bf6a6faa98f6bd9a16a3db3607b9208689d9bc8f303880b2c28cd1c11901afe54753953482983fff2b3b66ff519a7a
-MISC metadata.xml 299 SHA256 ba1a064b8296d69b6352f9d704ace3b4a601758427c0003d27a72c11b1098c26 SHA512 e37f4ff083447051304ad80f3ec20e58a81d35d3f97aa0ee02b6af8fd426b7b2c55fe67ceadac37f7cd16088140353cbbbe86d798ee8cb0c385c32d67ed15d04 WHIRLPOOL 705872a41bc4a04ed7491a347d909b3704fafa70f71a326d27053cad2f8369895c95f46bce36a373fbbb00054ef65bdde1d88cfc6ada5bc542bdbc297f57fe65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJQQsKiAAoJENXLsxwXqFxyhjcP/2lvWxr8kPVlc1Gefl/l3pYk
-vWkDtuYnUMcBItQFFAsVzLlbsZ1kEnz8mc3x4uTSZlmsOvqKjAU/CFVwQRDPe/9m
-rbmhfLAJFvZBzBKzSVeH3uXf6Jo3OrUN8uKVWF9tf0e06ofShWaLlEYgFZtkFB1+
-4srqU0sLuuPe2XBic+6CUw/ZVj0ZSyqcAeRmheTAs+Xpz1S9h3RmhlKhfaUT66SW
-UpzSX5ic2qTV97G3qK0Av3HZgRVUe7zgRnSEA1rBMrPiKeJgk/CY8yb9cw6cK2YV
-dsn9XlLDjtchqU71JzT8D3vAK9NugKhCIKGwQ4kirEkZepa17OSo5ezzLp0PsJOV
-bkHcIw8YdvMtU6mRKFTrqzkzHXdknRL1aEuD7QX4t+nI3mZOQJTyGtL+vgj6gvq0
-Uz5o3F1XeJGIoELecb1XFFDx/h4t+zFaTyEEDR76qEzrDMhXeskwW2VGipGH5OS5
-WawXfhFqvxOOJBtZwphNyimSF7KNEysqD2JwGhmAq2cx79SH6/4SkAyeYHePhm5P
-UtDteAv6gkEPS76wlwCadpN8Pm4vbgjx/rEFBl68D3ZnEjZoaxSXG7okZzNHE4NT
-Bi0ER9VHl7J5BXDOxCrkFgfEV+gbSQ2WQPYbMksiHiDs0IXj9EIKHrooTcbEY63H
-vK7dkfBBo10Q/qmSN2C6
-=qR+l
------END PGP SIGNATURE-----
+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
+EBUILD quiterss-0.10.2.ebuild 759 SHA256 b13985d6c9e5f73226ec3fe2872dbded8e43421353f00df9d0998069ff216b21 SHA512 1f1b13437e222b3c12dc0a216479a14f6ac56b019e9eb3e84700b49c9261b4543031af3a7f10a2b196847c01922befb8046187b89fe1db735c037c29ef3360d3 WHIRLPOOL 15fb37eecc63eb6095d0d084d126fd6b431d5361ec6dd92e92aa25bf6f7693598b8b6fb8b99d59c62ea9c8fc7c97ba1ec01b90a08ca1a5a3a32eb7c874300541
+MISC ChangeLog 813 SHA256 7dbd52ae48fa4c2046799ee70a26284bf2dd837e254d5be2ed7859c0849147ea SHA512 068fac0a8d1ba6a294271c2d280a794eddaa533f839849822a474a6e4d04a90b18a3c0d920af9e9f41402d1027fe4cde96d2da1fd9e7444033c728b5ab0469f1 WHIRLPOOL 49ba964503179179e796de578502d4dd6863382803b001a4ff8223d120b9bd574f1abeea0079f480d5fe037e51162556a9479d77a76c0af05c8494ed02eda51e
+MISC metadata.xml 306 SHA256 1e9e88933f61630889ccd531c512c47c5ae5626bb8af4bbc8cfd5083e5c5e336 SHA512 ea33bde61c3394bcd1b17467237d94d78d9f123d10ae200680b82c692598dbbfe3108694eb576de1eb613272c6bb696a1c6409603fc37415fee05dce64fa858f WHIRLPOOL 4f6ef9d720987665a3bccde23bfd0c10039ac81d332f86ae4d02f480b2841908a30364983d516cc57777bfce1101667ae1b7a4d5010341fffd979b96d901455c
diff --git a/net-news/quiterss/files/quiterss-unbundle-sqlite.patch b/net-news/quiterss/files/quiterss-unbundle-sqlite.patch
new file mode 100644
index 000000000000..30cc034c960f
--- /dev/null
+++ b/net-news/quiterss/files/quiterss-unbundle-sqlite.patch
@@ -0,0 +1,19 @@
+# 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/metadata.xml b/net-news/quiterss/metadata.xml
index 196f159633de..fe3543c9f707 100644
--- a/net-news/quiterss/metadata.xml
+++ b/net-news/quiterss/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
-	<upstream>
-		<remote-id type="google-code">quite-rss</remote-id>
-		<bugs-to>https://code.google.com/p/quite-rss/issues</bugs-to>
-	</upstream>
+  <herd>qt</herd>
+  <upstream>
+    <remote-id type="google-code">quite-rss</remote-id>
+    <bugs-to>https://code.google.com/p/quite-rss/issues</bugs-to>
+  </upstream>
 </pkgmetadata>
diff --git a/net-news/quiterss/quiterss-0.10.1.ebuild b/net-news/quiterss/quiterss-0.10.2.ebuild
index e005be22d3b8..deb4279ebfc0 100644
--- a/net-news/quiterss/quiterss-0.10.1.ebuild
+++ b/net-news/quiterss/quiterss-0.10.2.ebuild
@@ -1,13 +1,11 @@
 # 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.1.ebuild,v 1.1 2012/09/02 02:21:15 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/quiterss/quiterss-0.10.2.ebuild,v 1.1 2012/10/03 07:41:21 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"
@@ -24,5 +22,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
+}