Change pdep to qt-gui

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-hh1 i686

6 files changed, 16 insertions, 11 deletions

diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog
index 30e34a8c47c7..a01e0526b9be 100644
--- a/x11-libs/qt-core/ChangeLog
+++ b/x11-libs/qt-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-core
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.11 2008/08/13 09:28:02 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.12 2008/08/16 15:06:01 yngwin Exp $
+
+  16 Aug 2008; Ben de Groot <yngwin@gentoo.org> qt-core-4.4.1.ebuild,
+  qt-core-4.4.1-r1.ebuild:
+  Change pdepend to qt-gui to prevent circular dep
 
 *qt-core-4.4.1-r1 (13 Aug 2008)
 
diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest
index 6501bfcc001f..8a1412d8d9e4 100644
--- a/x11-libs/qt-core/Manifest
+++ b/x11-libs/qt-core/Manifest
@@ -3,7 +3,7 @@ DIST qt-x11-opensource-src-4.4.0.tar.bz2 98584925 RMD160 ddcfe3390e65761a45a6112
 DIST qt-x11-opensource-src-4.4.1-headers.tar.bz2 2503588 RMD160 7f4f798c42087f7efc1dc5a6b249f331b6b484c9 SHA1 c15691c6910565a8a64c0d84c4eeb89176f4f9dd SHA256 3183fd50d99b0079098429e87eb5d27e509b80d9b628688758941f6ce0e4b3c4
 DIST qt-x11-opensource-src-4.4.1.tar.bz2 99481677 RMD160 82526c00dd979ceda40d408c3bb09854afc8fed8 SHA1 b0087fe51271f81d4dc35d4cb7518ef84a36f3c2 SHA256 d6dcc8646df6e91907fae6b6846c5a65f1dd74be8c4393bf6208d91449515286
 EBUILD qt-core-4.4.0.ebuild 4966 RMD160 4ae12356468a67ef5cb0399ec2276495026fd9fa SHA1 e25c06f9c81865651ac326cf6935a6bf87629a76 SHA256 65c6959dbb887bcf1388ba3d0cf676bc30467cb874408e4b62eb219db3d3cac1
-EBUILD qt-core-4.4.1-r1.ebuild 5016 RMD160 75da7399fbec203446a4686f6adbcc7d163b384e SHA1 b261a47490763966b2e8a3099e71a097411c00de SHA256 ab100a1f785cc575f71a46119fe7992688d0bde5934ebb982e75db1f66bd11c7
-EBUILD qt-core-4.4.1.ebuild 4957 RMD160 133a0181810aadfbc281922ca65d7cfb54c37ab9 SHA1 52fca395ae45b3a342fcf78ab9c923d30962c7f0 SHA256 907840de884db349d464df44c70db7c0fdaa4beee7703b5f77f9d4b232d1abab
-MISC ChangeLog 1903 RMD160 7a700f3c5667b1b1f38ecdf731af5522e9862921 SHA1 36256bbf8e9bd703252e3e1d89920013df959d28 SHA256 f7124be286453bdad46c5982bf056e38e8205fa112561034ea25df7cf692c20f
+EBUILD qt-core-4.4.1-r1.ebuild 5009 RMD160 b5d7c301edcbb8c95141721396d9eed82f4d9105 SHA1 24ea99fc6be435ff3eff7dd4d4e2f63ad9f4c4dc SHA256 a2deaaea1b66086f37a080963443003acc784c937509c958d6eb9d45e217cd05
+EBUILD qt-core-4.4.1.ebuild 5006 RMD160 1a9965202409210406be8ad18df940e18be97b37 SHA1 fd3e2107d50398e0b98372ffb2b436e8b50a31fb SHA256 087bd2965e7d124bbfc52ca797ff03c7177a038d8f5f7733b67a0055a652baee
+MISC ChangeLog 2052 RMD160 80be216cf2d77f9973cee5601b170d7ed20839bf SHA1 b7a88875ce7f9874905ed3f3f534c9d97ca8a1b3 SHA256 7725b8c77ef1e9489fc5d060007df3bc073f223af579af64fb7fffaeaca010e7
 MISC metadata.xml 405 RMD160 7ad4cec9a392e8164062dae2935e2c59ba52b503 SHA1 104a2a88f1cf174e9e4827b639a73d79bd0fba2d SHA256 cce5d387ade0a1412bf70c58c7b0ab28fd488cc60e458ac66296ee632d893bf8
diff --git a/x11-libs/qt-core/qt-core-4.4.1-r1.ebuild b/x11-libs/qt-core/qt-core-4.4.1-r1.ebuild
index 23cd4fc16525..1e4be51d690a 100644
--- a/x11-libs/qt-core/qt-core-4.4.1-r1.ebuild
+++ b/x11-libs/qt-core/qt-core-4.4.1-r1.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/x11-libs/qt-core/qt-core-4.4.1-r1.ebuild,v 1.1 2008/08/13 09:28:02 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.4.1-r1.ebuild,v 1.2 2008/08/16 15:06:01 yngwin Exp $
 
 EAPI="1"
 inherit qt4-build
@@ -19,7 +19,7 @@ RDEPEND="sys-libs/zlib
 	!<=x11-libs/qt-4.4.0_alpha:${SLOT}"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
-PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV} )"
+PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV} )"
 
 QT4_TARGET_DIRECTORIES="
 src/tools/moc/
diff --git a/x11-libs/qt-core/qt-core-4.4.1.ebuild b/x11-libs/qt-core/qt-core-4.4.1.ebuild
index ffa0c50c760f..f60a47d9387a 100644
--- a/x11-libs/qt-core/qt-core-4.4.1.ebuild
+++ b/x11-libs/qt-core/qt-core-4.4.1.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/x11-libs/qt-core/qt-core-4.4.1.ebuild,v 1.1 2008/08/11 12:59:34 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.4.1.ebuild,v 1.2 2008/08/16 15:06:01 yngwin Exp $
 
 EAPI="1"
 inherit qt4-build
@@ -19,6 +19,7 @@ RDEPEND="sys-libs/zlib
 	!<=x11-libs/qt-4.4.0_alpha:${SLOT}"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
+PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV} )"
 
 QT4_TARGET_DIRECTORIES="
 src/tools/moc/
diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest
index 8f85ddd02242..4ad7de31119c 100644
--- a/x11-libs/qt-gui/Manifest
+++ b/x11-libs/qt-gui/Manifest
@@ -7,6 +7,6 @@ DIST qt-x11-opensource-src-4.4.0.tar.bz2 98584925 RMD160 ddcfe3390e65761a45a6112
 DIST qt-x11-opensource-src-4.4.1-headers.tar.bz2 2503588 RMD160 7f4f798c42087f7efc1dc5a6b249f331b6b484c9 SHA1 c15691c6910565a8a64c0d84c4eeb89176f4f9dd SHA256 3183fd50d99b0079098429e87eb5d27e509b80d9b628688758941f6ce0e4b3c4
 DIST qt-x11-opensource-src-4.4.1.tar.bz2 99481677 RMD160 82526c00dd979ceda40d408c3bb09854afc8fed8 SHA1 b0087fe51271f81d4dc35d4cb7518ef84a36f3c2 SHA256 d6dcc8646df6e91907fae6b6846c5a65f1dd74be8c4393bf6208d91449515286
 EBUILD qt-gui-4.4.0.ebuild 3883 RMD160 51c30f4e6b14107316b58df1f3656a8006e7acd6 SHA1 ef85d1bcf53998b1e0465f0c08458e3633cc9242 SHA256 472907ab8ae642a9d9f873e95a7e4e812189f0c16b015454834435a62554cee7
-EBUILD qt-gui-4.4.1.ebuild 3824 RMD160 a501db7be8d226897231b52e2c1ca2e81104df13 SHA1 26ef5e35083e5337a81cb1b2af842d9b4703f055 SHA256 088080a9d9f3d33243c6ab432c432d91e828dc09cf79d919642d13b17e41aa7a
-MISC ChangeLog 1831 RMD160 55bf16732c3c6b09a63aa3cfc7014a06b28b5454 SHA1 e1f65a637a5e430fae8f61a19c4e84d360a7752b SHA256 5308d5349d7e5838f34a418a376fe3d3f0213cbde0486aa5b4d304f60861cee5
+EBUILD qt-gui-4.4.1.ebuild 3880 RMD160 9a45bcaa1b8e40d96c518018b33df970731069f9 SHA1 066971e6ffdba45264f05c9f4e686cfce341fac4 SHA256 a3e757e1b60574a9dff85933ae67ffc774390ecba37e5c122b974c5646353648
+MISC ChangeLog 1932 RMD160 e85b2cd695241772c5040d7274b591d44429b4cf SHA1 675cbc40d2d09cd39e086807cf6ebf1f3b8f97a2 SHA256 2d8d50f23360a6424ba4276451660b0847f30830f1bf6f6bdb87236bd53dcdfd
 MISC metadata.xml 426 RMD160 82c15c9cce37ed4f91380dd174d67490902ef824 SHA1 777cc58f7d827e146751de5bb2e1b790ecae2f34 SHA256 ed24a12acb0e487adce4d6f6abade35e273ac48e61c5f6e7109d15b07920c328
diff --git a/x11-libs/qt-qt3support/Manifest b/x11-libs/qt-qt3support/Manifest
index 42149fffa54d..e94b1ca0632d 100644
--- a/x11-libs/qt-qt3support/Manifest
+++ b/x11-libs/qt-qt3support/Manifest
@@ -3,6 +3,6 @@ DIST qt-x11-opensource-src-4.4.0.tar.bz2 98584925 RMD160 ddcfe3390e65761a45a6112
 DIST qt-x11-opensource-src-4.4.1-headers.tar.bz2 2503588 RMD160 7f4f798c42087f7efc1dc5a6b249f331b6b484c9 SHA1 c15691c6910565a8a64c0d84c4eeb89176f4f9dd SHA256 3183fd50d99b0079098429e87eb5d27e509b80d9b628688758941f6ce0e4b3c4
 DIST qt-x11-opensource-src-4.4.1.tar.bz2 99481677 RMD160 82526c00dd979ceda40d408c3bb09854afc8fed8 SHA1 b0087fe51271f81d4dc35d4cb7518ef84a36f3c2 SHA256 d6dcc8646df6e91907fae6b6846c5a65f1dd74be8c4393bf6208d91449515286
 EBUILD qt-qt3support-4.4.0.ebuild 1246 RMD160 10f54d90b7079a31b80f6fa4ac62d23dbdde8b72 SHA1 21b28b3d53297c726a3729b2b87f24fdd8f3f6ad SHA256 a04c3c2be83e24bb6571d33d07e8f118909faedb75df4cf665c988b744275da9
-EBUILD qt-qt3support-4.4.1.ebuild 1238 RMD160 2286f04416f2e9d9de14137304508bb45a10ecb9 SHA1 8f253984f5e1512ff027faf86f56fa20e8c3a32a SHA256 143baf7f63eb4af13e7f837758df5e3a1dd8a42abcce1882d2767cc46bc20a49
-MISC ChangeLog 1813 RMD160 90761a618353699f1b35db3f759a3a0d85bd9245 SHA1 c1fe3de21e990b0426b166dd32ad7d69e666b0e0 SHA256 481836ef0e92e3c2f8189e6044cc1f6578866a60f2fc49328489db0f37e8ed22
+EBUILD qt-qt3support-4.4.1.ebuild 1263 RMD160 fcab66331d3e008d2d93f50bfcdd38e82211bcec SHA1 1fbe3f93b61a00d1670fd70f0e2c9eb8acaa7896 SHA256 d946d66f522cf04cf7d865275eb81a3a7b009c710c8bf0ec190781ae891bf0d2
+MISC ChangeLog 1920 RMD160 8c2086d80d559902e1a980a633920f003d456e0d SHA1 9af9876fc146c899c4336538b3275eb58de034c7 SHA256 9c5c2861de5aaec3c5120919a3754d80679919bfa79a7f9e0d3f7ff5a3853802
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448