Fix building with Qt 3.3.5, as per bug #139042, thanks to Wai Ling for reporting. Remove old version, and make skim support conditional to kde useflag in last version.

(Portage version: 2.1.1_pre2-r2)
 (Signed Manifest commit)

3 files changed, 34 insertions, 53 deletions

diff --git a/app-i18n/scim-tables/Manifest b/app-i18n/scim-tables/Manifest
index a4dcfba68a9d..9172752302ea 100644
--- a/app-i18n/scim-tables/Manifest
+++ b/app-i18n/scim-tables/Manifest
@@ -1,34 +1,43 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 4d9a8b2ffbceecad48a27ed29f337bbf ChangeLog 5075
-RMD160 0930b45c32a366262c01dd76acdd65a6e1234963 ChangeLog 5075
-SHA256 04a163351e39fe69705561b2a0a04245e634ff221ea7465ae39018cf4661aa46 ChangeLog 5075
-MD5 e4847ba4300cf9c35d4b6bd684f2db70 files/digest-scim-tables-0.5.3 70
-RMD160 b4d9aef8f1b58c7441cff9006028cf316ef4faab files/digest-scim-tables-0.5.3 70
-SHA256 5d20d43b936f126e61059c3a7387acd007d3f6131ba395a32ea9eb0ba601bb8b files/digest-scim-tables-0.5.3 70
-MD5 39d8067b6fcaeb97b18c653a28866ea9 files/digest-scim-tables-0.5.4 70
-RMD160 9e8b96d681c3752cef0c22b00ef2c87b199c141a files/digest-scim-tables-0.5.4 70
-SHA256 a2bbabdac3241e49b662c705a7eec7e40423a02d8b86173ed72666bc43ce17bd files/digest-scim-tables-0.5.4 70
-MD5 50e8e241b2ad41e6e168739c2473a7a9 files/digest-scim-tables-0.5.6 256
-RMD160 ca82b074e7efe9078c1d540ffbb479e2547b0744 files/digest-scim-tables-0.5.6 256
-SHA256 b1300ca898e77c16d439396fe5a0dd880c4bf1b483ca68c5ebf4f82fb18e3208 files/digest-scim-tables-0.5.6 256
+AUX scim-tables-0.5.6-fixconfigure.patch 1327 RMD160 ea9d500efedc6151853a6ac26dd7f9f9a14245f5 SHA1 53fa6c7f02eee979976a91b554b784b006557489 SHA256 543ebd250a486d02b2f92624eb92a3b21f7ec83a39d695eac92a7854064a9886
+MD5 921a08100c8b4a1796bf8a6a7c605bd5 files/scim-tables-0.5.6-fixconfigure.patch 1327
+RMD160 ea9d500efedc6151853a6ac26dd7f9f9a14245f5 files/scim-tables-0.5.6-fixconfigure.patch 1327
+SHA256 543ebd250a486d02b2f92624eb92a3b21f7ec83a39d695eac92a7854064a9886 files/scim-tables-0.5.6-fixconfigure.patch 1327
+AUX scim-tables-qt335.patch 879 RMD160 2c7c6d21ef90625b3cf6887f256e9de24010c3ef SHA1 ab0395c0e3408bacbbbe99511ba559bc6f7df5b9 SHA256 42959c420c8a0063d608fea8b936f11cc21df79292721577d6d4444ae090c71d
+MD5 cf68f2e79f2b5341e4bba6d6d7486249 files/scim-tables-qt335.patch 879
+RMD160 2c7c6d21ef90625b3cf6887f256e9de24010c3ef files/scim-tables-qt335.patch 879
+SHA256 42959c420c8a0063d608fea8b936f11cc21df79292721577d6d4444ae090c71d files/scim-tables-qt335.patch 879
+DIST kde-admindir-3.5.3.tar.bz2 187248 RMD160 81eedc1b81f2cee6709b7c8ad08859024da090f6 SHA1 6847a0c05ce3c11fcbef0de49b0c0d599e864982 SHA256 0cd8bf32dad0affa56edf5723747275be2b1e0702abefc28ded8763ad58fe07b
+DIST scim-tables-0.5.3.tar.gz 5539832 RMD160 8bd835dd9973106f436f178155f79b76f0e1e01c SHA1 aab123b59e4047caf7cf65589c2fef907899325f SHA256 3a5b0736d66687dfae24d95a4d3ed62b36f8135d0c304a4aeb5d9d586c1fd00f
+DIST scim-tables-0.5.6.tar.gz 7058913 RMD160 768b298cd9359742eedf1297f73a5be6eee3361e SHA1 25c3d800ae465cd9468a93c54398df59e0d3f743 SHA256 408cddeed4f5f9105f61822388fcd8947b1f2ba2d66bdabfa2be4e4f1d9393d0
+EBUILD scim-tables-0.5.3.ebuild 874 RMD160 3acbcb54aee0f7f38bf5d794644ae2bde614b734 SHA1 f8e638bd3230ce23427b509c8a7440833d455350 SHA256 4be0e434a3bc20c5ea317484aeb6351abc6723d411c13458f8f00d60561ae0db
+MD5 3b49658754aa4be6c645dd631e639c01 scim-tables-0.5.3.ebuild 874
+RMD160 3acbcb54aee0f7f38bf5d794644ae2bde614b734 scim-tables-0.5.3.ebuild 874
+SHA256 4be0e434a3bc20c5ea317484aeb6351abc6723d411c13458f8f00d60561ae0db scim-tables-0.5.3.ebuild 874
+EBUILD scim-tables-0.5.6.ebuild 1155 RMD160 dc7cf54e4501f015b4af0f2273653e317571abfc SHA1 7cb5561fe70ef492e4d3b95baec3e43079f7c602 SHA256 b899382e8dfd473e125875221ecf03bcd43dba0649cb8e07d3e1e5531ad36d4c
+MD5 733213eb7fa86be4572f350cc7056d06 scim-tables-0.5.6.ebuild 1155
+RMD160 dc7cf54e4501f015b4af0f2273653e317571abfc scim-tables-0.5.6.ebuild 1155
+SHA256 b899382e8dfd473e125875221ecf03bcd43dba0649cb8e07d3e1e5531ad36d4c scim-tables-0.5.6.ebuild 1155
+MISC ChangeLog 5467 RMD160 c1699c1dc714ccaa3ab1ccabc051e027f2ee096c SHA1 2f827c125dd21cfec9abdd253fe1a46fe2bc7b40 SHA256 fef4c8cda56458e43d6ffdc4018cb6fc57e907a4896f28acecb5e392a40837ae
+MD5 4a2dec7a898b9fccf6511674fc405cde ChangeLog 5467
+RMD160 c1699c1dc714ccaa3ab1ccabc051e027f2ee096c ChangeLog 5467
+SHA256 fef4c8cda56458e43d6ffdc4018cb6fc57e907a4896f28acecb5e392a40837ae ChangeLog 5467
+MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
 SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 metadata.xml 156
-MD5 b85caef120582119bd0f145a93015dae scim-tables-0.5.3.ebuild 783
-RMD160 14b0b15457629e4e972b580abfb68b625132b41d scim-tables-0.5.3.ebuild 783
-SHA256 714de7596df6cf00eb3520ece069a179120abb4873082674192d0d291f5432bb scim-tables-0.5.3.ebuild 783
-MD5 aabbe5208978757dabadd0ac1c1a636f scim-tables-0.5.4.ebuild 787
-RMD160 7ee2b9a5950782d69215e8c4561bb7eb095da991 scim-tables-0.5.4.ebuild 787
-SHA256 87281ed1a24c2aff981923bba71e5337c4398db60b96e3effc7dc685cc243ea4 scim-tables-0.5.4.ebuild 787
-MD5 1fc9cd2befcdb257a0e9558ccd21c2e2 scim-tables-0.5.6.ebuild 787
-RMD160 148728416b4036b37f6433edc67d26e456ca12c0 scim-tables-0.5.6.ebuild 787
-SHA256 be95195f378119d9a0320b1c3d9b9f40025d1570fe391dcb0d074d25cc4a8b87 scim-tables-0.5.6.ebuild 787
+MD5 82d70c739ef238c6879c0945fea5e871 files/digest-scim-tables-0.5.3 256
+RMD160 0200a439b0c84a476e30691af3cd2215e445a82c files/digest-scim-tables-0.5.3 256
+SHA256 ba5d6f6caeb241e75d8b92cbbb405cccc6cc94c6c6dc85dcb6dfadb763be55bf files/digest-scim-tables-0.5.3 256
+MD5 2894a6e239c515d0db8613f467bda112 files/digest-scim-tables-0.5.6 515
+RMD160 e38e4b9f0b30a66f4de586bbef1b892a9ecb465d files/digest-scim-tables-0.5.6 515
+SHA256 d1dd978105a7e778acb4c0366ca9e0430243f278372fbbb6c1df515235a5a6bd files/digest-scim-tables-0.5.6 515
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFD7OmT9ZFPrqoILX8RAgokAJ9m0dKeUCw38rg0ODzFXqZIMHWxSACfed6V
-eN7Oo8dWZ2OZjymOaPjzUlc=
-=38vK
+iD8DBQFEqWkoAiZjviIA2XgRArhYAJ9/5+FUYXVUYJlZw98Q1k8EN9bvRACgt77K
+NfwsOYE0wh4hIuE9/jNB7fE=
+=1dMI
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/scim-tables/files/digest-scim-tables-0.5.4 b/app-i18n/scim-tables/files/digest-scim-tables-0.5.4
deleted file mode 100644
index d224b40e5330..000000000000
--- a/app-i18n/scim-tables/files/digest-scim-tables-0.5.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 69ce8f1945ba2ab4bf820386e76c2cd9 scim-tables-0.5.4.tar.gz 5608023
diff --git a/app-i18n/scim-tables/scim-tables-0.5.4.ebuild b/app-i18n/scim-tables/scim-tables-0.5.4.ebuild
deleted file mode 100644
index 4b2537e1841c..000000000000
--- a/app-i18n/scim-tables/scim-tables-0.5.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tables/scim-tables-0.5.4.ebuild,v 1.2 2006/02/10 19:29:06 liquidx Exp $
-
-inherit kde-functions
-
-DESCRIPTION="Smart Common Input Method (SCIM) Generic Table Input Method Server"
-HOMEPAGE="http://www.scim-im.org/"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="arts"
-
-DEPEND="|| ( x11-libs/libXt virtual/x11 )
-	|| ( >=app-i18n/scim-1.1 >=app-i18n/scim-cvs-1.1 )"
-
-src_compile() {
-	econf $(use_with arts) || die "econf failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "install failed"
-	dodoc README ChangeLog AUTHORS
-}