Removed alternative dependency on Qt metapackage

Package-Manager: portage-2.2_rc43/cvs/Linux x86_64

4 files changed, 24 insertions, 10 deletions

diff --git a/app-i18n/scim-bridge/ChangeLog b/app-i18n/scim-bridge/ChangeLog
index 400f68eaad90..b34d417bd8fc 100644
--- a/app-i18n/scim-bridge/ChangeLog
+++ b/app-i18n/scim-bridge/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/scim-bridge
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/ChangeLog,v 1.28 2009/10/02 22:31:32 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/ChangeLog,v 1.29 2009/10/05 19:19:05 ayoy Exp $
+
+  05 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> scim-bridge-0.4.16.ebuild,
+  scim-bridge-0.4.16-r1.ebuild:
+  Removed alternative dependency on Qt metapackage
 
 *scim-bridge-0.4.16-r1 (02 Oct 2009)
 
diff --git a/app-i18n/scim-bridge/Manifest b/app-i18n/scim-bridge/Manifest
index 66162a14c9bb..03d9c9e645be 100644
--- a/app-i18n/scim-bridge/Manifest
+++ b/app-i18n/scim-bridge/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX scim-bridge-0.4.14-qt4.patch 1163 RMD160 82b4ee7269455843c46aa09d18b722c907addbe6 SHA1 d62b9e9f5f5c6b7490e0d49e8a50cc8812d36ffd SHA256 3bf397ff3a8330a920289335838cb240ae998575bc775f47eb703a8e8677fb05
 AUX scim-bridge-0.4.15-qt4-focus.patch 1974 RMD160 99dff169717446c0a38aa19eed932a0b9954bf05 SHA1 193529b5f75097a5d43c6fb675574fdfdf88a8f0 SHA256 124fc258c1f7cadabea5b9c5a7b8b3ab9b26d50910b16760d5746f58ab6b8a50
 AUX scim-bridge-0.4.15.2-gcc43.patch 375 RMD160 e46eef9e25195786680e28817b3b70aa5cd14b6b SHA1 f2f6c1ce4a7a71073977824c3b76a739740391e1 SHA256 0595a929766a9f29a0ad888696512c35caff1b9e3d91ceca29d05e3222a62a18
@@ -5,8 +8,15 @@ AUX scim-bridge-0.4.15.2-qt4.patch 2146 RMD160 5d040ef796df0ee98e7e70befed00ba04
 AUX scim-bridge-0.4.16+gcc-4.4.patch 382 RMD160 4310e77e9572779d470e20f81f494b8787e75d17 SHA1 b17d1cda0104f3a5ae3ec294bfe964fb82a5fbcc SHA256 f80ca88a66de77447601270f60f31b46e32bb18058da91e726375c7757ee7719
 DIST scim-bridge-0.4.16.tar.gz 508870 RMD160 37aed056fb880358b013f104f08b2e58c3de4188 SHA1 6a7a714592dbecc9a1f44794f37319bafe2bdfae SHA256 50d9da4a2842ab31cd3b27b1baacb14c458614bdb35855c6ecd09ab855ac702c
 DIST scim-bridge-0.4.9.tar.gz 509254 RMD160 ad135d1de043be68d1bb3eb358687da13f7e43f7 SHA1 fb76c95d6cb45954a894de1e265aa7ababf3091e SHA256 4851ee787525700960f6d6d3644d5cb99a609c231407daaf0eb7e54657e08cea
-EBUILD scim-bridge-0.4.16-r1.ebuild 2336 RMD160 fea1319827a1922551010734e24f452f475d99fb SHA1 ebd62a07ecf7c82f0e82d68ee6aa87c108994c0e SHA256 655849bc53db6bb81d0a1ff2a2ce0926d753ee4e14bb9ab615587f1e97dc9f0d
-EBUILD scim-bridge-0.4.16.ebuild 2006 RMD160 6ed44e6f21dd5a97f58a379e64aa1f4b1c39dc72 SHA1 bca412526b694761d50297655847d4f14d31f9a1 SHA256 3f58bd45f1d093d225c1cddef8a476895a0095e1ab3906746018402e680cfeea
+EBUILD scim-bridge-0.4.16-r1.ebuild 2302 RMD160 a4b42f48b0b615b853c0c78286f525b2ef749d29 SHA1 8df9c0201f3e41355faa81977c3eb7bc428a14f7 SHA256 408aa3112ce257d4a2e6d4e9b234f1e13ede7de638fe4e32b0429cfdacd27d1a
+EBUILD scim-bridge-0.4.16.ebuild 1968 RMD160 41578f3900d99902e80c838051704285eb3fd3e5 SHA1 d63f02c1e2ce40a7b918cc01c65a16bad8da8167 SHA256 2782581b6b4f87feb7ddf303a981096b5e877f4894a002e149503e4aa1f7ea90
 EBUILD scim-bridge-0.4.9.ebuild 1766 RMD160 465f7ced4fa46e7a51b909bcc5db2be3a9f2cdd5 SHA1 bba097d405cbfeb450a0f2a3d88ea93f4a55a04a SHA256 b1e271734904a906fe4c0170702efdf2ea0764fc4cb5cd33ce50006d3f078260
-MISC ChangeLog 4883 RMD160 903d8e63ca31b74cd6de64cf931c9495ab26154f SHA1 8c8fa853619dc1054257fa0d92a78f11c0738b6f SHA256 1e84ae78bb186eb3d246e4d2889541bfe51047eeed69ba2ac541a715c32f952f
+MISC ChangeLog 5041 RMD160 7d10eb63cdc9075aac91a69d0a663e219429ffe3 SHA1 6e4631fd0de1ad8f7b327cf81ff742329513ef8d SHA256 794c363a9fdc5409abf8bbd7d96bed4719a8b16489f836c83cb81a41d317d9e4
 MISC metadata.xml 157 RMD160 97adcce791d5b0e94b3844a1e27e00be60378454 SHA1 e11f0d9b1f8c57c4f50e453a89d2e61cf737329a SHA256 92a8379a3f1d8c9e52e17dbaf224721ad5bd6ba9fba4302e909aa2b099b33f89
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkrKRrIACgkQ+CZEqwt+F6b8uACfZ8hHZAIZKeKgM/L1Uw6UATL4
+CsYAoIn42HybwYoRJi6iCnTDE2dK1Luc
+=Mtil
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/scim-bridge/scim-bridge-0.4.16-r1.ebuild b/app-i18n/scim-bridge/scim-bridge-0.4.16-r1.ebuild
index 708126bc99d3..21efa989c8cb 100644
--- a/app-i18n/scim-bridge/scim-bridge-0.4.16-r1.ebuild
+++ b/app-i18n/scim-bridge/scim-bridge-0.4.16-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/scim-bridge-0.4.16-r1.ebuild,v 1.1 2009/10/02 22:31:32 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/scim-bridge-0.4.16-r1.ebuild,v 1.2 2009/10/05 19:19:05 ayoy Exp $
 
 EAPI="2"
 
@@ -30,8 +30,8 @@ RDEPEND=">=app-i18n/scim-1.4.6
 		>=x11-libs/pango-1.1
 	)
 	qt4? (
-		|| ( ( x11-libs/qt-gui:4 x11-libs/qt-core:4 )
-			=x11-libs/qt-4.3*:4 )
+		x11-libs/qt-gui:4
+		x11-libs/qt-core:4
 		>=x11-libs/pango-1.1
 	)"
 DEPEND="${RDEPEND}
diff --git a/app-i18n/scim-bridge/scim-bridge-0.4.16.ebuild b/app-i18n/scim-bridge/scim-bridge-0.4.16.ebuild
index a39c196f2e87..703484c18ff9 100644
--- a/app-i18n/scim-bridge/scim-bridge-0.4.16.ebuild
+++ b/app-i18n/scim-bridge/scim-bridge-0.4.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/scim-bridge-0.4.16.ebuild,v 1.3 2009/08/15 13:20:59 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/scim-bridge-0.4.16.ebuild,v 1.4 2009/10/05 19:19:05 ayoy Exp $
 
 EAPI="2"
 
@@ -30,8 +30,8 @@ RDEPEND=">=app-i18n/scim-1.4.6
 		>=x11-libs/pango-1.1
 	)
 	qt4? (
-		|| ( ( x11-libs/qt-gui:4 x11-libs/qt-core:4 )
-			=x11-libs/qt-4.3*:4 )
+		x11-libs/qt-gui:4
+		x11-libs/qt-core:4
 		>=x11-libs/pango-1.1
 	)"
 DEPEND="${RDEPEND}