Make dependencies compatible with split Qt-4.4.0*.

Package-Manager: portage-2.1.4.4
RepoMan-Options: --force

diff --git a/app-crypt/qca/ChangeLog b/app-crypt/qca/ChangeLog
index ec0ec6854314f0e6c04ccebabdb3725c5b1d48c7..c8d448ee956c18dea0b3c0e2130eea07c8e689fe 100644 (file)
--- a/app-crypt/qca/ChangeLog
+++ b/app-crypt/qca/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-crypt/qca
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.35 2008/03/01 04:58:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.36 2008/03/05 23:50:47 ingmar Exp $
+
+  05 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org> qca-2.0.0-r2.ebuild:
+  Make dependencies compatible with split Qt-4.4.0*.
 
   01 Mar 2008; Jeroen Roovers <jer@gentoo.org> qca-2.0.0-r2.ebuild:
   Marked ~hppa.

diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index cdfce70000c51adee1400c4ea74ba514489ab60c..06c8827b01ebe8bdecadf19b57c312d5e60f2685 100644 (file)
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX qca-1.0-fbsd.patch 753 RMD160 481eee7ad8e334f1551c00de7ac7f597694a92a2 SHA1 582f3259623ee82ec38a1a9e4391b22c2946c0ac SHA256 53a0257ecbf917741b41ab4bc50a1d9518cb1bd86f0be36dbf3a1c6ef1d5257c
 AUX qca-2.0.0-debug-same-pkgconfig-file.patch 1112 RMD160 a0bbc98447d7ddfa090bc20b404655c768f00947 SHA1 7c11cceb62d46094367d5cb81088d96d376bbdfe SHA256 5240f0853a3d918efe6ef861cdf1c5b0e611f165257d3e74479468de014d1883
 AUX qca-pathfix.patch 267 RMD160 933217ccfdf29b4b37a8a6106ec79bb42f68ab13 SHA1 2cdbf42746969bbfcf03eceae5309f444a8e7145 SHA256 423980ef7c981a1af07297e1f8abd4769a70e2e92a638012cac68d912b0dea4c
@@ -5,6 +8,13 @@ DIST qca-1.0.tar.bz2 30677 RMD160 129d8eeed68fb98e9cba94040b8f75b9f94c8a60 SHA1
 DIST qca-2.0.0.tar.bz2 5106520 RMD160 256ca518fea507d03b67c0f5d26ba2ac7b3db517 SHA1 5b896647426637e1974703f2950786746408c70b SHA256 2ed0d49300459ae1f2d138fc2e68ed7f92850065981032c96f2538e1878fc2d3
 EBUILD qca-1.0-r2.ebuild 1077 RMD160 e12f85ae3979c4ddaf6bf6ac80712fdeb83e4c8c SHA1 07d39853f914ee7400348263f7b5698d0252aafc SHA256 0158f8d392a69162453844fbcfa3ac0a2954d903aa0b684d0a2c043158bfc5dc
 EBUILD qca-1.0-r3.ebuild 1369 RMD160 9605aa81cb54f0068a75caec7ded038b408f729a SHA1 fb865513508cef723ee53a99a1d88e7224c8289c SHA256 199598dda1a4c4537b3d9c95a9d71129aea5421e1cea79bd57cbbd6adccec9a7
-EBUILD qca-2.0.0-r2.ebuild 2075 RMD160 89f926904b96b36cb04b3dc609aa29c96cbbf76d SHA1 73eebfbd797894eb003562806f878be9faac7590 SHA256 34c08929c7a4920a6cad149f7efe4ab0162f4c0f5730eb041125c1862ec54db1
-MISC ChangeLog 4234 RMD160 ff82ae0c74f1ce06019556c089eee1388458b0fd SHA1 781d2fa0280980a88e54ec10ecaa80aa730016b3 SHA256 9220c78daf5f0bc224eb9b60939b016179dd8a2eab9165adfe8434eebcd45124
+EBUILD qca-2.0.0-r2.ebuild 2279 RMD160 8b42b471fd8efaff6a45cf9bbf7794fa9e837ad5 SHA1 94851f4b851e252c59f680734618a7fed22181c1 SHA256 55806e7e6f6fdf764f3931dd7873b511a725b8ce02d238f5e2c696d19293850f
+MISC ChangeLog 4364 RMD160 0fe999b44623ca2fe1f2b407507f931bbcebe156 SHA1 b24c06d1ab14d5835a66ac92cba2e3a8ccf68a72 SHA256 fdfa217e7412bfc7b4370aba650edbbcb9a2988c373182f03caf0186e5e41e97
 MISC metadata.xml 192 RMD160 421d4665996ea38fdfc756e2da700603abe17ec7 SHA1 c32af4b790776c36b524e5f2e2dca587c9cd3351 SHA256 e585d77a075b30463ad28cc89374f9ef2876636bca95a23321b824e0122aa6fd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHzzF+B18eXLOpYdkRAvihAJ40O8VxzTZnFRgCzPHFNxETf9ozHwCff/vI
+ioQpXiDzCampt3a2t5ynQwk=
+=ClJZ
+-----END PGP SIGNATURE-----

diff --git a/app-crypt/qca/qca-2.0.0-r2.ebuild b/app-crypt/qca/qca-2.0.0-r2.ebuild
index 95f9d6390e722c6599db0de70118bf428df1299a..e2c659fdc40c7a53c4af071e6eb1e9254d2ade6a 100644 (file)
--- a/app-crypt/qca/qca-2.0.0-r2.ebuild
+++ b/app-crypt/qca/qca-2.0.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.0.0-r2.ebuild,v 1.6 2008/03/01 04:58:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.0.0-r2.ebuild,v 1.7 2008/03/05 23:50:47 ingmar Exp $
 
 EAPI="1"
 
@@ -18,20 +18,21 @@ RESTRICT="test"
 
 DEPEND="
        !<app-crypt/qca-1.0-r3
-       >=x11-libs/qt-4.2.0:4"
+       || ( x11-libs/qt-core:4
+               >=x11-libs/qt-4.2.0:4 )"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
-       if use debug && ! built_with_use x11-libs/qt:4 debug; then
-               echo
-               eerror "You are trying to compile ${PN} package with USE=\"debug\""
-               eerror "while qt4 is built without this particular flag."
-               echo
-               eerror "Possible solutions to this problem are:"
-               eerror "a) install package ${PN} without debug USE flag"
-               eerror "b) re-emerge qt4 with debug USE flag"
-               echo
-               die "can't emerge ${PN} with debug USE flag"
+       if use debug; then
+               if has_version "<x11-libs/qt-4.4.0_alpha1:4" && ! built_with_use x11-libs/qt:4 debug; then
+                       eerror "You are trying to compile ${PN} with USE=\"debug\""
+                       eerror "while x11-libs/qt:4 is built without this particular flag."
+                       die "Rebuild x11-libs/qt:4 with USE=\"debug\"."
+               elif has_version "x11-libs/qt-core:4" && ! built_with_use x11-libs/qt-core:4 debug; then
+                       eerror "You are trying to compile ${PN} with USE=\"debug\""
+                       eerror "while x11-libs/qt-core:4 is built without this particular flag."
+                       die "Rebuild x11-libs/qt-core:4 with USE=\"debug\"."
+               fi
        fi
 }