[patch] I messed up the first patch after a CVS conflict

quassel-add-splitqt.patch (text/plain), 3.06 KB, created by Thomas Anderson (tanderson) (RETIRED) on 2008-02-26 13:47:29 UTC

? quassel-add-splitqt.patch
Index: Manifest
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/Manifest,v
retrieving revision 1.4
diff -u -b -B -r1.4 Manifest
--- Manifest	26 Feb 2008 13:25:06 -0000	1.4
+++ Manifest	26 Feb 2008 13:46:50 -0000
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST quassel-0.2.0-alpha1.tar.bz2 919272 RMD160 8ebb61f525a49b2dc91d8985273e844d3e7b8879 SHA1 c437026f7db02548507a101d37e8f00d54439000 SHA256 3b64f29922fe8720488d9b22d8db49df72ba23a40aa46182cbd4813c14cdf525
-EBUILD quassel-0.2.0_alpha1.ebuild 1224 RMD160 89ff9ea9baabac79140e48b2abb94452e4cec632 SHA1 aeeec40f91cf6857844e16fcb5f3c86edd71ff49 SHA256 a173205e79b8e18b32812df219f34da3690765df0bef19ef1560d949aed084c1
+EBUILD quassel-0.2.0_alpha1.ebuild 1627 RMD160 243eedde5d545083e79f83e3296a6430ed115754 SHA1 362b72034598ea0f42df2b70c36ff14b1796e108 SHA256 16b6c03832c3b5f0a5aef0d30147b5ddaee8508dbecfd7d130cf8c60d10d3cae
+MISC .#Manifest.1.3 786 RMD160 fb540501ea3e679a7b1e9ed744513b1e424a8e7f SHA1 7af1cb86d86f3f927ebdd1483e4f0b539ae8fd1a SHA256 77ef7c517ea805b9007ba10c8da4b1738369f326bb894cf5e19b95180c328a45
+MISC .#quassel-0.2.0_alpha1.ebuild.1.2 1587 RMD160 f83fb652318e659e8df383b3495f640be1213a86 SHA1 2f527d0212dd639be0cdb7538aadb42d80b35707 SHA256 d0ba4715633098f8d6b1d7c3e38ea4f10defa9852ebcb8117b53a0fb0429fbc6
 MISC ChangeLog 716 RMD160 aee7873b777898f3ddd47df2cbcd98479496108a SHA1 48dc88da3fdc8cb385c52011625b6603ad75f060 SHA256 36b5edff8df72db2214a4686d86d541b34b7e6beeaa9a60a606c32f35b460067
 MISC metadata.xml 505 RMD160 c1e365560a7938ea6ce218f3624b8c96a738d7ca SHA1 66c409b535ea77b7fbe1301210bcb3f17124d3a3 SHA256 496b4e75e14a40eacfbeebc935089e7fbfb35965289d987e966a3a97531bc12a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHxBMtAiZjviIA2XgRAmEkAKCxIKfNnA2QL8qBwyfWK/lJ4QfnHQCdHAo2
-NCuUaRXZ0fOwOrfl81lX33I=
-=de+y
------END PGP SIGNATURE-----
Index: quassel-0.2.0_alpha1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.2.0_alpha1.ebuild,v
retrieving revision 1.3
diff -u -b -B -r1.3 quassel-0.2.0_alpha1.ebuild
--- quassel-0.2.0_alpha1.ebuild	26 Feb 2008 13:24:55 -0000	1.3
+++ quassel-0.2.0_alpha1.ebuild	26 Feb 2008 13:46:50 -0000
@@ -21,15 +21,25 @@
 
 IUSE="+X debug"
 
-RDEPEND="$(qt4_min_version 4.3)"
+RDEPEND="|| ( x11-libs/qt-gui x11-libs/qt-sql ) ( >=x11-libs/qt-4.3*:4 )"
 DEPEND="${RDEPEND}"
 
 pkg_setup() {
+	if has_version x11-libs/qt:4; then
 	if ! built_with_use x11-libs/qt:4 sqlite3; then
 		eerror "Quassel require Qt 4 built with SQLite support"
 		eerror "Please rebuild x11-libs/qt:4 with sqlite3 USE flag enabled."
 		die "Missing sqlite3 support in x11-libs/qt:4"
 	fi
+	fi
+
+	if has_version x11-libs/qt-sql; then 
+		if ! built_with_use x11-libs/qt-sql sqlite; then
+			eerror "Quassel requires Qt 4 built with SQLite support"
+			eerror "Please rebuild x11-libs/qt-sql with sqlite USE flag enabled."
+			die "Missing sqlite support in x11-libs/qt-sql"
+		fi
+	fi
 }
 
 src_compile() {