6 files changed, 35 insertions, 15 deletions
diff --git a/app-i18n/skim/ChangeLog b/app-i18n/skim/ChangeLog
index f719089237cb..0d3ffea8eff7 100644
--- a/app-i18n/skim/ChangeLog
+++ b/app-i18n/skim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/skim
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/ChangeLog,v 1.34 2005/09/02 19:57:42 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/ChangeLog,v 1.35 2005/10/30 02:53:23 usata Exp $
+
+*skim-1.4.2 (30 Oct 2005)
+
+  30 Oct 2005; Mamoru KOMACHI <usata@gentoo.org> -skim-1.3.1.ebuild,
+  skim-1.4.1.ebuild, +skim-1.4.2.ebuild:
+  Version bumped.
 
   02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> skim-1.4.0.ebuild:
   Stable on ppc.
diff --git a/app-i18n/skim/Manifest b/app-i18n/skim/Manifest
index 0b089c8b251a..73fde962108c 100644
--- a/app-i18n/skim/Manifest
+++ b/app-i18n/skim/Manifest
@@ -1,10 +1,12 @@
-MD5 c1a718dd44a9d44af5669e337935045c skim-1.2.3.ebuild 1185
-MD5 81f433abfa3fe47f3f8b641fe39186c4 skim-1.4.0.ebuild 1659
-MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 be8b10e8861d33a2179d0da347f31ed2 ChangeLog 4674
+MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
+MD5 81f433abfa3fe47f3f8b641fe39186c4 skim-1.4.0.ebuild 1659
+MD5 c1a718dd44a9d44af5669e337935045c skim-1.2.3.ebuild 1185
 MD5 3c217ef266c62cacef306aea9b99e711 skim-1.4.1.ebuild 1660
 MD5 f4fdd703970a0cca979bef289bb569b2 skim-1.3.1.ebuild 1134
+MD5 3c217ef266c62cacef306aea9b99e711 skim-1.4.2.ebuild 1660
+MD5 c91303045f74536acab4c1acb4ab9e30 files/digest-skim-1.2.3 64
+MD5 209a989fc8cf4d26de3e7f402769e2a9 files/digest-skim-1.4.0 64
 MD5 9f3e930c55590fe519f75e387d27ae1f files/digest-skim-1.3.1 64
 MD5 421d42ba961204816564723772d95f45 files/digest-skim-1.4.1 64
-MD5 209a989fc8cf4d26de3e7f402769e2a9 files/digest-skim-1.4.0 64
-MD5 c91303045f74536acab4c1acb4ab9e30 files/digest-skim-1.2.3 64
+MD5 21de6c894faa7a998f12c927a0ecf32e files/digest-skim-1.4.2 64
diff --git a/app-i18n/skim/files/digest-skim-1.3.1 b/app-i18n/skim/files/digest-skim-1.3.1
deleted file mode 100644
index 03fe8b65f571..000000000000
--- a/app-i18n/skim/files/digest-skim-1.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0624f41631347ee4c6d143f520b5ff0c skim-1.3.1.tar.bz2 1480420
diff --git a/app-i18n/skim/files/digest-skim-1.4.2 b/app-i18n/skim/files/digest-skim-1.4.2
new file mode 100644
index 000000000000..be34dbc69fb2
--- /dev/null
+++ b/app-i18n/skim/files/digest-skim-1.4.2
@@ -0,0 +1 @@
+MD5 0f1b783b4cd7e834656912be53eb644b skim-1.4.2.tar.bz2 1062345
diff --git a/app-i18n/skim/skim-1.4.1.ebuild b/app-i18n/skim/skim-1.4.1.ebuild
index e8f243c787f5..3fd4aacc1360 100644
--- a/app-i18n/skim/skim-1.4.1.ebuild
+++ b/app-i18n/skim/skim-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2000-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/skim-1.4.1.ebuild,v 1.2 2005/08/22 21:58:47 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/skim-1.4.1.ebuild,v 1.3 2005/10/30 02:53:23 usata Exp $
 
 inherit kde multilib
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 DEPEND="|| ( >=app-i18n/scim-1.3.3 >=app-i18n/scim-cvs-1.3.3 )"
diff --git a/app-i18n/skim/skim-1.3.1.ebuild b/app-i18n/skim/skim-1.4.2.ebuild
index be58b4bf9500..b8fe42798206 100644
--- a/app-i18n/skim/skim-1.3.1.ebuild
+++ b/app-i18n/skim/skim-1.4.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 2000-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/skim-1.3.1.ebuild,v 1.1 2005/06/26 15:26:00 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/skim-1.4.2.ebuild,v 1.1 2005/10/30 02:53:23 usata Exp $
 
-inherit kde
+inherit kde multilib
 
 DESCRIPTION="Smart Common Input Method (SCIM) optimized for KDE"
 HOMEPAGE="http://www.scim-im.org/"
@@ -11,15 +11,23 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="|| ( >=app-i18n/scim-1.3 >=app-i18n/scim-cvs-1.3 )"
+DEPEND="|| ( >=app-i18n/scim-1.3.3 >=app-i18n/scim-cvs-1.3.3 )"
 
 need-kde 3.2
 
+src_compile() {
+	#sed -i -e "/=.*DESTDIR/s@\(\['DESTDIR'\]\)@\1 + '/usr'@" bksys/generic.py || die
+	#sed -i -e "/basedir =.*DESTDIR/s@\(\['DESTDIR'\]\)@\1 + '/usr'@g" bksys/generic.py || die
+	#sed -i -e "s@\(basedir+subdir\)@\1+'/usr'@g" bksys/generic.py || die
+	./configure prefix=/usr libdir=/usr/$(get_libdir) || die
+	./scons || die
+}
+
 src_install() {
-	kde_src_install
+	DESTDIR=${D} ./scons prefix=/usr install || die
 
 	mv ${D}/usr/share/doc/HTML ${D}/usr/share/doc/${PF}/html
 }
@@ -30,12 +38,16 @@ pkg_postinst() {
 	einfo "such as .xinitrc to incorporate"
 	einfo
 	einfo '	export XMODIFIERS=@im=SCIM'
+	einfo ' export QT_IM_MODULE=scim'
+	einfo ' export GTK_IM_MODULE=scim'
 	einfo '	export LANG="zh_CN.GBK"'
 	einfo '	startkde'
 	einfo
 	einfo "or if you prefer English interface,"
 	einfo
 	einfo '	export XMODIFIERS=@im=SCIM'
+	einfo ' export QT_IM_MODULE=scim'
+	einfo ' export GTK_IM_MODULE=scim'
 	einfo '	export LC_CTYPE="zh_CN.GBK"'
 	einfo '	startkde'
 	einfo